From e9ba2caac77eac339552014f43a51072622ecdf9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Nov 2015 19:28:12 +0100 Subject: [PATCH] Rename blending functions --- menu/drivers/glui.c | 12 ++++++------ menu/drivers/xmb.c | 14 +++++++------- menu/drivers/zarch.c | 4 ++-- menu/menu_display.c | 8 ++++---- menu/menu_display.h | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index f47ec85117..1279565caa 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_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); 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, gl->shader, &coords, &mymat, texture, 4, MENU_DISPLAY_PRIM_TRIANGLESTRIP); - menu_display_draw_icon_blend_end(gl); + menu_display_blend_end(gl); } static void glui_blit_line(float x, float y, unsigned width, unsigned height, @@ -251,7 +251,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_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); menu_display_draw_frame( x, @@ -264,7 +264,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_draw_icon_blend_end(gl); + menu_display_blend_end(gl); } static void glui_draw_scrollbar(gl_t *gl, unsigned width, unsigned height, GRfloat *coord_color) @@ -591,7 +591,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_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); menu_display_draw_frame( x - 32, @@ -602,7 +602,7 @@ static void glui_draw_cursor(gl_t *gl, glui_handle_t *glui, glui->textures.list[GLUI_TEXTURE_POINTER].id, 4, MENU_DISPLAY_PRIM_TRIANGLESTRIP); - menu_display_draw_icon_blend_end(gl); + menu_display_blend_end(gl); } 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 6b83c5614d..22276e7cad 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1397,7 +1397,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, TEXT_ALIGN_LEFT, width, height); - menu_display_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); /* set alpha components of color */ color[3] = color[7] = color[11] = color[15] = (node->alpha > xmb->alpha) ? xmb->alpha : node->alpha; @@ -1420,7 +1420,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, 0, 1, &color[0]); - menu_display_draw_icon_blend_end(gl); + menu_display_blend_end(gl); } } @@ -1440,7 +1440,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_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); menu_display_draw_frame( x - (xmb->cursor.size/2), @@ -1450,7 +1450,7 @@ static void xmb_draw_cursor(gl_t *gl, xmb_handle_t *xmb, gl->shader, &coords, &mymat, xmb->textures.list[XMB_TEXTURE_POINTER].id, 4, MENU_DISPLAY_PRIM_TRIANGLESTRIP); - menu_display_draw_icon_blend_end(gl); + menu_display_blend_end(gl); } static void xmb_render(void) @@ -1524,7 +1524,7 @@ static void xmb_frame_horizontal_list(xmb_handle_t *xmb, if (!node) continue; - menu_display_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); /* set alpha components of color */ color[3] = color[7] = color[11] = color[15] = (node->alpha > xmb->alpha) ? xmb->alpha : node->alpha; @@ -1540,7 +1540,7 @@ static void xmb_frame_horizontal_list(xmb_handle_t *xmb, node->zoom, &color[0]); - menu_display_draw_icon_blend_end(gl); + menu_display_blend_end(gl); } } @@ -1649,7 +1649,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_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); 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 9436f279be..ffa7fd6964 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_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); menu_display_draw_frame( 0, @@ -1067,7 +1067,7 @@ static void zarch_frame(void) &zui->mvp, zui->textures.white, zui->ca.coords.vertices, MENU_DISPLAY_PRIM_TRIANGLES); - menu_display_draw_icon_blend_end(gl); + menu_display_blend_end(gl); menu_display_frame_background(menu, settings, gl, zui->width, zui->height, diff --git a/menu/menu_display.c b/menu/menu_display.c index 962eb2f225..a82b9ab1af 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -503,7 +503,7 @@ static GLenum menu_display_prim_to_gl_enum(enum menu_display_prim_type prim_type return 0; } -void menu_display_draw_icon_blend_begin(void *data) +void menu_display_blend_begin(void *data) { gl_t *gl = (gl_t*)data; @@ -517,7 +517,7 @@ void menu_display_draw_icon_blend_begin(void *data) gl->shader->use(gl, GL_SHADER_STOCK_BLEND); } -void menu_display_draw_icon_blend_end(void *data) +void menu_display_blend_end(void *data) { (void)data; @@ -588,13 +588,13 @@ void menu_display_frame_background( && texture) coords.color = (const float*)coord_color2; - menu_display_draw_icon_blend_begin(gl); + menu_display_blend_begin(gl); menu_display_draw_frame(0, 0, width, height, gl->shader, &coords, &gl->mvp_no_rot, texture, vertex_count, prim_type); - menu_display_draw_icon_blend_end(gl); + menu_display_blend_end(gl); gl->coords.color = gl->white_color_ptr; } diff --git a/menu/menu_display.h b/menu/menu_display.h index a8fc509899..fa351da6ba 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -104,9 +104,9 @@ void menu_display_draw_frame( enum menu_display_prim_type prim_type ); -void menu_display_draw_icon_blend_begin(void *data); +void menu_display_blend_begin(void *data); -void menu_display_draw_icon_blend_end(void *data); +void menu_display_blend_end(void *data); void menu_display_frame_background( menu_handle_t *menu,