libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-12 20:58:18 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

(Menu drivers) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-04-09 05:57:34 +02:00
parent edda6bac9e
commit a644e807e2
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/drivers/glui.c
View File

@ -54,10 +54,10 @@ typedef struct glui_handle
static int glui_entry_iterate(unsigned action) static int glui_entry_iterate(unsigned action)
{ {
const char *label = NULL; const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
if (!menu || !runloop) if (!menu || !runloop)
return -1; return -1;
@ -84,8 +84,6 @@ static void glui_blit_line(gl_t *gl, float x, float y, const char *message, uint
{ {
struct font_params params = {0}; struct font_params params = {0};
/* gl_set_viewport(gl, gl->win_width, gl->win_height, false, false); */
params.x = x / gl->win_width; params.x = x / gl->win_width;
params.y = 1.0f - y / gl->win_height; params.y = 1.0f - y / gl->win_height;
params.scale = 1.0; params.scale = 1.0;

7
menu/drivers/rmenu.c
View File

@ -66,9 +66,9 @@ static bool menu_texture_inited =false;
static int rmenu_entry_iterate(unsigned action) static int rmenu_entry_iterate(unsigned action)
{ {
const char *label = NULL; const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
if (!menu) if (!menu)
return -1; return -1;
@ -261,9 +261,6 @@ static void rmenu_render(void)
snprintf(message, sizeof(message), "%c %s", snprintf(message, sizeof(message), "%c %s",
selected ? '>' : ' ', entry_title_buf); selected ? '>' : ' ', entry_title_buf);
#if 0
blit_line(x, y, message, selected);
#endif
font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET; font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET;
font_parms.y = POSITION_EDGE_MIN + POSITION_RENDER_OFFSET font_parms.y = POSITION_EDGE_MIN + POSITION_RENDER_OFFSET
+ (POSITION_OFFSET * j); + (POSITION_OFFSET * j);

2
menu/drivers/xmb.c
View File

@ -400,8 +400,6 @@ static void xmb_draw_text(gl_t *gl, xmb_handle_t *xmb, const char *str, float x,
|| y < -xmb->icon.size || y > gl->win_height + xmb->icon.size) || y < -xmb->icon.size || y > gl->win_height + xmb->icon.size)
return; return;
/* gl_set_viewport(gl, gl->win_width, gl->win_height, false, false); */
params.x = x / gl->win_width; params.x = x / gl->win_width;
params.y = 1.0f - y / gl->win_height; params.y = 1.0f - y / gl->win_height;