diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 2d4732d04b..2b86ba3513 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -345,7 +345,7 @@ static void glui_frame(void) && !glui->box_message[0]) 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); @@ -430,7 +430,7 @@ static void glui_frame(void) 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) @@ -473,7 +473,7 @@ static void *glui_init(void) goto error; glui = (glui_handle_t*)menu->userdata; - dpi = menu_display_get_dpi(menu); + dpi = menu_display_get_dpi(); glui->line_height = dpi / 3; glui->margin = dpi / 6; diff --git a/menu/drivers/shared.h b/menu/drivers/shared.h index d67afdd8f6..97cfbb2906 100644 --- a/menu/drivers/shared.h +++ b/menu/drivers/shared.h @@ -100,7 +100,7 @@ static INLINE void gl_menu_frame_background( coords.lut_tex_coord = tex_coord; coords.color = black_color; - menu_display_set_viewport(menu); + menu_display_set_viewport(); if ((settings->menu.pause_libretro || !global->main_is_init || global->libretro_dummy) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 23e540a580..94ca097e1e 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1308,7 +1308,7 @@ static void xmb_frame(void) if (settings->menu.mouse.enable) 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) diff --git a/menu/menu_display.c b/menu/menu_display.c index 7160b684bf..14d879e1a6 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -83,12 +83,12 @@ bool menu_display_init(menu_handle_t *menu) return true; } -float menu_display_get_dpi(menu_handle_t *menu) +float menu_display_get_dpi(void) { float dpi = menu_dpi_override_value; settings_t *settings = config_get_ptr(); - if (!menu || !settings) + if (!settings) return dpi; if (settings->menu.dpi.override_enable) @@ -191,7 +191,7 @@ bool menu_display_init_main_font(menu_handle_t *menu, return result; } -void menu_display_set_viewport(menu_handle_t *menu) +void menu_display_set_viewport(void) { 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); } -void menu_display_unset_viewport(menu_handle_t *menu) +void menu_display_unset_viewport(void) { global_t *global = global_get_ptr(); diff --git a/menu/menu_display.h b/menu/menu_display.h index ea026310f0..c80ffd6d9c 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -33,7 +33,7 @@ bool menu_display_init(menu_handle_t *menu); 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, 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); 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 }