diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 21ff048147..8dbb90e7ce 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -183,7 +183,7 @@ static void glui_draw_icon(gl_t *gl, glui_handle_t *glui, struct gfx_coords coords; math_matrix_4x4 mymat, mrot, mscal; - menu_display_blend_begin(gl); + menu_display_blend_begin(); matrix_4x4_rotate_z(&mrot, rotation); matrix_4x4_multiply(&mymat, &mrot, &gl->mvp_no_rot); @@ -205,7 +205,7 @@ static void glui_draw_icon(gl_t *gl, glui_handle_t *glui, &coords, &mymat, texture, MENU_DISPLAY_PRIM_TRIANGLESTRIP); - menu_display_blend_end(gl); + menu_display_blend_end(); } static void glui_blit_line(float x, float y, unsigned width, unsigned height, @@ -256,7 +256,7 @@ static void glui_render_quad(gl_t *gl, int x, int y, int w, int h, coords.lut_tex_coord = glui_tex_coords; coords.color = coord_color; - menu_display_blend_begin(gl); + menu_display_blend_begin(); menu_display_draw_frame( x, @@ -268,7 +268,7 @@ static void glui_render_quad(gl_t *gl, int x, int y, int w, int h, gl->coords.color = gl->white_color_ptr; - menu_display_blend_end(gl); + menu_display_blend_end(); } static void glui_draw_scrollbar(gl_t *gl, unsigned width, unsigned height, GRfloat *coord_color) @@ -595,7 +595,7 @@ static void glui_draw_cursor(gl_t *gl, glui_handle_t *glui, coords.lut_tex_coord = glui_tex_coords; coords.color = (const float*)color; - menu_display_blend_begin(gl); + menu_display_blend_begin(); menu_display_draw_frame( x - 32, @@ -606,7 +606,7 @@ static void glui_draw_cursor(gl_t *gl, glui_handle_t *glui, glui->textures.list[GLUI_TEXTURE_POINTER].id, MENU_DISPLAY_PRIM_TRIANGLESTRIP); - menu_display_blend_end(gl); + menu_display_blend_end(); } static size_t glui_list_get_size(void *data, menu_list_type_t type) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 9e7397add2..847b4eb15e 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1391,7 +1391,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, TEXT_ALIGN_LEFT, width, height); - menu_display_blend_begin(gl); + menu_display_blend_begin(); /* set alpha components of color */ color[3] = color[7] = color[11] = color[15] = (node->alpha > xmb->alpha) ? xmb->alpha : node->alpha; @@ -1414,7 +1414,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, 0, 1, &color[0]); - menu_display_blend_end(gl); + menu_display_blend_end(); } } @@ -1434,7 +1434,7 @@ static void xmb_draw_cursor(gl_t *gl, xmb_handle_t *xmb, coords.lut_tex_coord = rmb_tex_coord; coords.color = (const float*)color; - menu_display_blend_begin(gl); + menu_display_blend_begin(); menu_display_draw_frame( x - (xmb->cursor.size/2), @@ -1444,7 +1444,7 @@ static void xmb_draw_cursor(gl_t *gl, xmb_handle_t *xmb, &coords, &mymat, xmb->textures.list[XMB_TEXTURE_POINTER].id, MENU_DISPLAY_PRIM_TRIANGLESTRIP); - menu_display_blend_end(gl); + menu_display_blend_end(); } static void xmb_render(void) @@ -1518,7 +1518,7 @@ static void xmb_frame_horizontal_list(xmb_handle_t *xmb, if (!node) continue; - menu_display_blend_begin(gl); + menu_display_blend_begin(); /* set alpha components of color */ color[3] = color[7] = color[11] = color[15] = (node->alpha > xmb->alpha) ? xmb->alpha : node->alpha; @@ -1534,7 +1534,7 @@ static void xmb_frame_horizontal_list(xmb_handle_t *xmb, node->zoom, &color[0]); - menu_display_blend_end(gl); + menu_display_blend_end(); } } @@ -1643,7 +1643,7 @@ static void xmb_frame(void) matrix_4x4_scale(&mscal, 1 /* scale_factor */, 1 /* scale_factor */, 1); matrix_4x4_multiply(&mymat, &mscal, &mymat); - menu_display_blend_begin(gl); + menu_display_blend_begin(); if (settings->menu.boxart_enable && xmb->boxart) xmb_draw_boxart(gl, xmb, &coord_color2[0], width, height); diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 55af2fbeb2..fb29961755 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -1056,7 +1056,7 @@ static void zarch_frame(void) else if (zui->item.active == 0) zui->item.active = -1; - menu_display_blend_begin(gl); + menu_display_blend_begin(); menu_display_draw_frame( 0, @@ -1067,7 +1067,7 @@ static void zarch_frame(void) &zui->mvp, zui->textures.white, MENU_DISPLAY_PRIM_TRIANGLES); - menu_display_blend_end(gl); + menu_display_blend_end(); menu_display_frame_background(menu, settings, gl, zui->width, zui->height, diff --git a/menu/menu_display.c b/menu/menu_display.c index 2da11c2d60..b9ac998f13 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -503,9 +503,9 @@ static GLenum menu_display_prim_to_gl_enum(enum menu_display_prim_type prim_type return 0; } -void menu_display_blend_begin(void *data) +void menu_display_blend_begin(void) { - gl_t *gl = (gl_t*)data; + gl_t *gl = (gl_t*)video_driver_get_ptr(NULL); if (!gl) return; @@ -517,10 +517,8 @@ void menu_display_blend_begin(void *data) gl->shader->use(gl, GL_SHADER_STOCK_BLEND); } -void menu_display_blend_end(void *data) +void menu_display_blend_end(void) { - (void)data; - glDisable(GL_BLEND); } @@ -578,7 +576,7 @@ void menu_display_frame_background( coords.lut_tex_coord = tex_coord; coords.color = (const float*)coord_color; - menu_display_blend_begin(gl); + menu_display_blend_begin(); menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL); @@ -592,7 +590,7 @@ void menu_display_frame_background( &coords, &gl->mvp_no_rot, texture, prim_type); - menu_display_blend_end(gl); + menu_display_blend_end(); gl->coords.color = gl->white_color_ptr; } diff --git a/menu/menu_display.h b/menu/menu_display.h index 1e251f370a..9948866daf 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -102,9 +102,9 @@ void menu_display_draw_frame( enum menu_display_prim_type prim_type ); -void menu_display_blend_begin(void *data); +void menu_display_blend_begin(void); -void menu_display_blend_end(void *data); +void menu_display_blend_end(void); void menu_display_frame_background( menu_handle_t *menu,