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

Get rid of some gl_t * pointers

This commit is contained in:
twinaphex 2015-11-02 19:04:20 +01:00
parent 10051a657c
commit c8cb03e412
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/drivers/xmb.c
View File

@ -382,7 +382,7 @@ static void xmb_draw_icon(gl_t *gl, xmb_handle_t *xmb,
MENU_DISPLAY_PRIM_TRIANGLESTRIP); MENU_DISPLAY_PRIM_TRIANGLESTRIP);
} }
static void xmb_draw_icon_predone(gl_t *gl, xmb_handle_t *xmb, static void xmb_draw_icon_predone(xmb_handle_t *xmb,
math_matrix_4x4 *mymat, math_matrix_4x4 *mymat,
GRuint texture, GRuint texture,
float x, float y, float x, float y,
@ -504,7 +504,6 @@ static void xmb_frame_messagebox(const char *message)
unsigned i; unsigned i;
unsigned width, height; unsigned width, height;
struct string_list *list = NULL; struct string_list *list = NULL;
gl_t *gl = NULL;
xmb_handle_t *xmb = NULL; xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -518,11 +517,6 @@ static void xmb_frame_messagebox(const char *message)
if (!xmb) if (!xmb)
return; return;
gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl)
return;
list = string_split(message, "\n"); list = string_split(message, "\n");
if (!list) if (!list)
return; return;
@ -1410,7 +1404,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
color[3] = color[7] = color[11] = color[15] = (node->alpha > xmb->alpha) ? xmb->alpha : node->alpha; color[3] = color[7] = color[11] = color[15] = (node->alpha > xmb->alpha) ? xmb->alpha : node->alpha;
if (texture_switch != 0 && color[3] != 0) if (texture_switch != 0 && color[3] != 0)
xmb_draw_icon_predone(gl, xmb, &mymat, xmb_draw_icon_predone(xmb, &mymat,
texture_switch, texture_switch,
node->x + xmb->margins.screen.left + xmb->icon.spacing.horizontal node->x + xmb->margins.screen.left + xmb->icon.spacing.horizontal
+ xmb->icon.size / 2.0 + xmb->margins.setting.left, + xmb->icon.size / 2.0 + xmb->margins.setting.left,
@ -1658,7 +1652,7 @@ static void xmb_frame(void)
coord_color2[3] = coord_color2[7] = coord_color2[11] = coord_color2[15] = (1.00f > xmb->alpha) ? xmb->alpha : 1.00f; coord_color2[3] = coord_color2[7] = coord_color2[11] = coord_color2[15] = (1.00f > xmb->alpha) ? xmb->alpha : 1.00f;
if (settings->menu.timedate_enable && coord_color2[3] != 0) if (settings->menu.timedate_enable && coord_color2[3] != 0)
xmb_draw_icon_predone(gl, xmb, &mymat, xmb->textures.list[XMB_TEXTURE_CLOCK].id, xmb_draw_icon_predone(xmb, &mymat, xmb->textures.list[XMB_TEXTURE_CLOCK].id,
width - xmb->icon.size, xmb->icon.size, width, height, 1, 0, 1, &coord_color2[0]); width - xmb->icon.size, xmb->icon.size, width, height, 1, 0, 1, &coord_color2[0]);
/* set alpha components of colors */ /* set alpha components of colors */
@ -1666,7 +1660,7 @@ static void xmb_frame(void)
? xmb->alpha : xmb->textures.arrow.alpha; ? xmb->alpha : xmb->textures.arrow.alpha;
if (coord_color2[3] != 0) if (coord_color2[3] != 0)
xmb_draw_icon_predone(gl, xmb_draw_icon_predone(
xmb, xmb,
&mymat, &mymat,
xmb->textures.list[XMB_TEXTURE_ARROW].id, xmb->textures.list[XMB_TEXTURE_ARROW].id,
@ -2262,7 +2256,6 @@ static void xmb_context_reset(void)
char mediapath[PATH_MAX_LENGTH] = {0}; char mediapath[PATH_MAX_LENGTH] = {0};
char themepath[PATH_MAX_LENGTH] = {0}; char themepath[PATH_MAX_LENGTH] = {0};
char iconpath[PATH_MAX_LENGTH] = {0}; char iconpath[PATH_MAX_LENGTH] = {0};
gl_t *gl = NULL;
xmb_handle_t *xmb = NULL; xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -2270,10 +2263,6 @@ static void xmb_context_reset(void)
if (!menu) if (!menu)
return; return;
gl = (gl_t*)video_driver_get_ptr(NULL);
if (!gl)
return;
xmb = (xmb_handle_t*)menu->userdata; xmb = (xmb_handle_t*)menu->userdata;
if (!xmb) if (!xmb)
return; return;