ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XMB) Cleanups

This commit is contained in:
twinaphex 2015-04-27 02:58:50 +02:00
parent 2c0c598b8e
commit 81f3f67232
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
menu/drivers/xmb.c
View File

@ -280,13 +280,20 @@ static void xmb_draw_icon_end(void)
static void xmb_draw_frame( static void xmb_draw_frame(
const shader_backend_t *shader, const shader_backend_t *shader,
struct gl_coords *coords, struct gl_coords *coords,
math_matrix_4x4 *mat) math_matrix_4x4 *mat,
bool blend)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
shader->set_coords(coords); shader->set_coords(coords);
shader->set_mvp(driver->video_data, mat); shader->set_mvp(driver->video_data, mat);
if (blend)
glEnable(GL_BLEND);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
if (blend)
glDisable(GL_BLEND);
} }
static void xmb_draw_icon(gl_t *gl, xmb_handle_t *xmb, static void xmb_draw_icon(gl_t *gl, xmb_handle_t *xmb,
@ -335,7 +342,7 @@ static void xmb_draw_icon(gl_t *gl, xmb_handle_t *xmb,
matrix_4x4_scale(&mscal, scale_factor, scale_factor, 1); matrix_4x4_scale(&mscal, scale_factor, scale_factor, 1);
matrix_4x4_multiply(&mymat, &mscal, &mymat); matrix_4x4_multiply(&mymat, &mscal, &mymat);
xmb_draw_frame(gl->shader, &coords, &mymat); xmb_draw_frame(gl->shader, &coords, &mymat, false);
} }
static void xmb_draw_icon_predone(gl_t *gl, xmb_handle_t *xmb, static void xmb_draw_icon_predone(gl_t *gl, xmb_handle_t *xmb,
@ -378,7 +385,7 @@ static void xmb_draw_icon_predone(gl_t *gl, xmb_handle_t *xmb,
coords.color = color; coords.color = color;
glBindTexture(GL_TEXTURE_2D, texture); glBindTexture(GL_TEXTURE_2D, texture);
xmb_draw_frame(gl->shader, &coords, mymat); xmb_draw_frame(gl->shader, &coords, mymat, false);
} }
static void xmb_draw_text(menu_handle_t *menu, static void xmb_draw_text(menu_handle_t *menu,
@ -475,12 +482,8 @@ static void xmb_frame_background(menu_handle_t *menu,
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
} }
gl->shader->set_coords(&coords); xmb_draw_frame(gl->shader, &coords,
gl->shader->set_mvp(gl, &gl->mvp_no_rot); &gl->mvp_no_rot, true);
glEnable(GL_BLEND);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDisable(GL_BLEND);
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
} }
@ -1242,12 +1245,8 @@ static void xmb_draw_cursor(gl_t *gl, xmb_handle_t *xmb, float x, float y)
matrix_4x4_rotate_z(&mrot, 0); matrix_4x4_rotate_z(&mrot, 0);
matrix_4x4_multiply(&mymat, &mrot, &gl->mvp_no_rot); matrix_4x4_multiply(&mymat, &mrot, &gl->mvp_no_rot);
glEnable(GL_BLEND); xmb_draw_icon_begin();
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); xmb_draw_frame(gl->shader, &coords, &mymat, true);
xmb_draw_frame(gl->shader, &coords, &mymat);
glDisable(GL_BLEND);
} }
static void xmb_render(void) static void xmb_render(void)