From f9742d21a2628ae0e4cd86e44c61aa9f75e6a7b1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 25 Sep 2015 20:37:04 +0200 Subject: [PATCH] (Menu) Refactors --- menu/drivers/glui.c | 1 - menu/drivers/rgui.c | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 4db85771bc..c54eb28e34 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -210,7 +210,6 @@ static void glui_render(void) unsigned width, height; glui_handle_t *glui = NULL; menu_display_t *disp = menu_display_get_ptr(); - menu_framebuf_t *frame_buf = menu_display_fb_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); settings_t *settings = config_get_ptr(); diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index df14171c3d..d972ba4163 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -700,22 +700,24 @@ static void rgui_free(void *data) static void rgui_set_texture(void) { - menu_handle_t *menu = menu_driver_get_ptr(); + unsigned fb_width, fb_height; + menu_handle_t *menu = menu_driver_get_ptr(); menu_framebuf_t *frame_buf = menu_display_fb_get_ptr(); if (!menu) return; - if (!frame_buf->dirty) return; + menu_display_ctl(MENU_DISPLAY_CTL_WIDTH, &fb_width); + menu_display_ctl(MENU_DISPLAY_CTL_HEIGHT, &fb_height); menu_display_ctl(MENU_DISPLAY_CTL_UNSET_FRAMEBUFFER_DIRTY_FLAG, NULL); video_driver_set_texture_frame( frame_buf->data, false, - frame_buf->width, - frame_buf->height, + fb_width, + fb_height, 1.0f); } @@ -733,7 +735,6 @@ static void rgui_navigation_set(bool scroll) { size_t selection, fb_width, fb_height; menu_handle_t *menu = menu_driver_get_ptr(); - menu_framebuf_t *frame_buf = menu_display_fb_get_ptr(); size_t end = menu_entries_get_end(); if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return;