mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 05:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XMB) xmb_draw_icon_begin - call shader->use once

Browse Source
This commit is contained in:
twinaphex 2015-04-27 04:55:27 +02:00
parent 6be4345aa1
commit 5d0da65f91
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/drivers/xmb.c
View File

@ -265,10 +265,13 @@ static int xmb_entry_iterate(unsigned action)
return -1; return -1;
} }
static void xmb_draw_icon_begin(void) static void xmb_draw_icon_begin(gl_t *gl)
{ {
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
if (gl->shader && gl->shader->use)
gl->shader->use(gl, GL_SHADER_STOCK_BLEND);
} }
static void xmb_draw_icon_end(void) static void xmb_draw_icon_end(void)
@ -304,9 +307,6 @@ static void xmb_draw_icon(gl_t *gl, xmb_handle_t *xmb,
1.0f, 1.0f, 1.0f, alpha, 1.0f, 1.0f, 1.0f, alpha,
}; };
if (gl->shader && gl->shader->use)
gl->shader->use(gl, GL_SHADER_STOCK_BLEND);
glViewport(x, global->video_data.height - y, xmb->icon.size, xmb->icon.size); glViewport(x, global->video_data.height - y, xmb->icon.size, xmb->icon.size);
coords.vertices = 4; coords.vertices = 4;
@ -1099,7 +1099,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
TEXT_ALIGN_LEFT); TEXT_ALIGN_LEFT);
xmb_draw_icon_begin(); xmb_draw_icon_begin(gl);
xmb_draw_icon(gl, xmb, icon, icon_x, icon_y, node->alpha, 0, node->zoom); xmb_draw_icon(gl, xmb, icon, icon_x, icon_y, node->alpha, 0, node->zoom);
@ -1151,7 +1151,7 @@ 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);
xmb_draw_icon_begin(); xmb_draw_icon_begin(gl);
menu_gl_draw_frame(gl->shader, &coords, &mymat, true); menu_gl_draw_frame(gl->shader, &coords, &mymat, true);
} }
@ -1295,7 +1295,7 @@ static void xmb_frame(void)
matrix_4x4_scale(&mscal, 1 /* scale_factor */, 1 /* scale_factor */, 1); matrix_4x4_scale(&mscal, 1 /* scale_factor */, 1 /* scale_factor */, 1);
matrix_4x4_multiply(&mymat, &mscal, &mymat); matrix_4x4_multiply(&mymat, &mscal, &mymat);
xmb_draw_icon_begin(); xmb_draw_icon_begin(gl);
if (settings->menu.timedate_enable) if (settings->menu.timedate_enable)
xmb_draw_icon_predone(gl, xmb, &mymat, xmb->textures.list[XMB_TEXTURE_CLOCK].id, xmb_draw_icon_predone(gl, xmb, &mymat, xmb->textures.list[XMB_TEXTURE_CLOCK].id,
@ -1319,7 +1319,7 @@ static void xmb_frame(void)
if (node) if (node)
{ {
xmb_draw_icon_begin(); xmb_draw_icon_begin(gl);
xmb_draw_icon(gl, xmb, node->icon, xmb_draw_icon(gl, xmb, node->icon,
xmb->x + xmb->categories.x_pos + xmb->x + xmb->categories.x_pos +
xmb->margins.screen.left + xmb->margins.screen.left +