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

Some functions don't need a menu_handle_t * argument

This commit is contained in:
twinaphex 2015-05-12 14:41:01 +02:00
parent 884b3b25c1
commit 1e981cc31b
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/drivers/glui.c
View File

@ -345,7 +345,7 @@ static void glui_frame(void)
&& !glui->box_message[0]) && !glui->box_message[0])
return; return;
menu_display_set_viewport(menu); menu_display_set_viewport();
gl_menu_frame_background(menu, settings, gl, glui->textures.bg.id, 0.75f, 0.75f, false); gl_menu_frame_background(menu, settings, gl, glui->textures.bg.id, 0.75f, 0.75f, false);
@ -430,7 +430,7 @@ static void glui_frame(void)
gl->shader->use(gl, GL_SHADER_STOCK_BLEND); gl->shader->use(gl, GL_SHADER_STOCK_BLEND);
menu_display_unset_viewport(menu); menu_display_unset_viewport();
} }
static void glui_allocate_white_texture(glui_handle_t *glui) static void glui_allocate_white_texture(glui_handle_t *glui)
@ -473,7 +473,7 @@ static void *glui_init(void)
goto error; goto error;
glui = (glui_handle_t*)menu->userdata; glui = (glui_handle_t*)menu->userdata;
dpi = menu_display_get_dpi(menu); dpi = menu_display_get_dpi();
glui->line_height = dpi / 3; glui->line_height = dpi / 3;
glui->margin = dpi / 6; glui->margin = dpi / 6;

2
menu/drivers/shared.h
View File

@ -100,7 +100,7 @@ static INLINE void gl_menu_frame_background(
coords.lut_tex_coord = tex_coord; coords.lut_tex_coord = tex_coord;
coords.color = black_color; coords.color = black_color;
menu_display_set_viewport(menu); menu_display_set_viewport();
if ((settings->menu.pause_libretro if ((settings->menu.pause_libretro
|| !global->main_is_init || global->libretro_dummy) || !global->main_is_init || global->libretro_dummy)

2
menu/drivers/xmb.c
View File

@ -1308,7 +1308,7 @@ static void xmb_frame(void)
if (settings->menu.mouse.enable) if (settings->menu.mouse.enable)
xmb_draw_cursor(gl, xmb, menu->mouse.x, menu->mouse.y); xmb_draw_cursor(gl, xmb, menu->mouse.x, menu->mouse.y);
menu_display_unset_viewport(menu); menu_display_unset_viewport();
} }
static void *xmb_init(void) static void *xmb_init(void)

8
menu/menu_display.c
View File

@ -83,12 +83,12 @@ bool menu_display_init(menu_handle_t *menu)
return true; return true;
} }
float menu_display_get_dpi(menu_handle_t *menu) float menu_display_get_dpi(void)
{ {
float dpi = menu_dpi_override_value; float dpi = menu_dpi_override_value;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!menu || !settings) if (!settings)
return dpi; return dpi;
if (settings->menu.dpi.override_enable) if (settings->menu.dpi.override_enable)
@ -191,7 +191,7 @@ bool menu_display_init_main_font(menu_handle_t *menu,
return result; return result;
} }
void menu_display_set_viewport(menu_handle_t *menu) void menu_display_set_viewport(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
@ -199,7 +199,7 @@ void menu_display_set_viewport(menu_handle_t *menu)
global->video_data.height, true, false); global->video_data.height, true, false);
} }
void menu_display_unset_viewport(menu_handle_t *menu) void menu_display_unset_viewport(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();

6
menu/menu_display.h
View File

@ -33,7 +33,7 @@ bool menu_display_init(menu_handle_t *menu);
bool menu_display_update_pending(void); bool menu_display_update_pending(void);
float menu_display_get_dpi(menu_handle_t *menu); float menu_display_get_dpi(void);
bool menu_display_font_init_first(const void **font_driver, bool menu_display_font_init_first(const void **font_driver,
void **font_handle, void *video_data, const char *font_path, void **font_handle, void *video_data, const char *font_path,
@ -50,9 +50,9 @@ bool menu_display_init_main_font(menu_handle_t *menu,
const char *font_path, float font_size); const char *font_path, float font_size);
void menu_display_free_main_font(menu_handle_t *menu); void menu_display_free_main_font(menu_handle_t *menu);
void menu_display_set_viewport(menu_handle_t *menu); void menu_display_set_viewport(void);
void menu_display_unset_viewport(menu_handle_t *menu); void menu_display_unset_viewport(void);
#ifdef __cplusplus #ifdef __cplusplus
} }