(Menu) Remove useless variables

This commit is contained in:
Jean-André Santoni 2016-04-22 17:21:52 +07:00
parent d76cca7a47
commit a06ebe33e4
4 changed files with 4 additions and 16 deletions

View File

@ -807,8 +807,6 @@ static void mui_frame(void *data)
draw.width = width; draw.width = width;
draw.height = height; draw.height = height;
draw.texture = menu_display_white_texture; draw.texture = menu_display_white_texture;
draw.handle_alpha = 0.75f;
draw.force_transparency = false;
draw.color = &white_transp_bg[0]; draw.color = &white_transp_bg[0];
draw.vertex = NULL; draw.vertex = NULL;
draw.tex_coord = NULL; draw.tex_coord = NULL;
@ -820,7 +818,7 @@ static void mui_frame(void *data)
|| !rarch_ctl(RARCH_CTL_IS_INITED, NULL) || !rarch_ctl(RARCH_CTL_IS_INITED, NULL)
|| rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)
) )
&& !draw.force_transparency && draw.texture) && draw.texture)
draw.color = &white_bg[0]; draw.color = &white_bg[0];
mui_draw_bg(&draw); mui_draw_bg(&draw);
@ -847,8 +845,6 @@ static void mui_frame(void *data)
draw.width = width; draw.width = width;
draw.height = height; draw.height = height;
draw.texture = mui->textures.bg; draw.texture = mui->textures.bg;
draw.handle_alpha = 0.75f;
draw.force_transparency = true;
draw.color = &white_transp_bg[0]; draw.color = &white_transp_bg[0];
draw.vertex = NULL; draw.vertex = NULL;
draw.tex_coord = NULL; draw.tex_coord = NULL;
@ -860,7 +856,7 @@ static void mui_frame(void *data)
|| !rarch_ctl(RARCH_CTL_IS_INITED, NULL) || !rarch_ctl(RARCH_CTL_IS_INITED, NULL)
|| rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)
) )
&& !draw.force_transparency && draw.texture) && draw.texture)
draw.color = &white_bg[0]; draw.color = &white_bg[0];
mui_draw_bg(&draw); mui_draw_bg(&draw);

View File

@ -1873,7 +1873,6 @@ static void xmb_draw_bg(
unsigned width, unsigned width,
unsigned height, unsigned height,
float alpha, float alpha,
bool force_transparency,
uintptr_t texture_id, uintptr_t texture_id,
float *coord_black, float *coord_black,
float *coord_white) float *coord_white)
@ -1885,8 +1884,6 @@ static void xmb_draw_bg(
draw.width = width; draw.width = width;
draw.height = height; draw.height = height;
draw.color = &coord_black[0]; draw.color = &coord_black[0];
draw.handle_alpha = alpha;
draw.force_transparency = force_transparency;
draw.vertex = NULL; draw.vertex = NULL;
draw.tex_coord = NULL; draw.tex_coord = NULL;
draw.vertex_count = 4; draw.vertex_count = 4;
@ -1894,7 +1891,7 @@ static void xmb_draw_bg(
if ( if (
!menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL) !menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL)
&& !draw.force_transparency && draw.texture) && draw.texture)
draw.color = &coord_white[0]; draw.color = &coord_white[0];
@ -1999,7 +1996,6 @@ static void xmb_frame(void *data)
width, width,
height, height,
xmb->alpha, xmb->alpha,
false,
xmb->textures.bg, xmb->textures.bg,
coord_black, coord_black,
coord_white); coord_white);

View File

@ -965,8 +965,6 @@ static void zarch_frame(void *data)
draw.width = zui->width; draw.width = zui->width;
draw.height = zui->height; draw.height = zui->height;
draw.texture = zui->textures.bg; draw.texture = zui->textures.bg;
draw.handle_alpha = 0.75f;
draw.force_transparency = false;
draw.color = &coord_color[0]; draw.color = &coord_color[0];
draw.vertex = NULL; draw.vertex = NULL;
draw.tex_coord = coord_draw.ptr; draw.tex_coord = coord_draw.ptr;
@ -978,7 +976,7 @@ static void zarch_frame(void *data)
|| !rarch_ctl(RARCH_CTL_IS_INITED, NULL) || !rarch_ctl(RARCH_CTL_IS_INITED, NULL)
|| rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)
) )
&& !draw.force_transparency && draw.texture) && draw.texture)
draw.color = &coord_color2[0]; draw.color = &coord_color2[0];
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL); menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);

View File

@ -117,8 +117,6 @@ typedef struct menu_display_ctx_draw
void *matrix_data; void *matrix_data;
uintptr_t texture; uintptr_t texture;
enum menu_display_prim_type prim_type; enum menu_display_prim_type prim_type;
float handle_alpha;
bool force_transparency;
float *color; float *color;
const float *vertex; const float *vertex;
const float *tex_coord; const float *tex_coord;