diff --git a/frontend/frontend.c b/frontend/frontend.c index 84b5500f4a..47e57cca0d 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -44,7 +44,6 @@ **/ void main_exit(void *args) { - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); @@ -53,6 +52,7 @@ void main_exit(void *args) if (global->inited.main) { #ifdef HAVE_MENU + driver_t *driver = driver_get_ptr(); /* Do not want menu context to live any more. */ driver->menu_data_own = false; #endif diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp index 360de77963..3bec5c195f 100644 --- a/gfx/common/win32_common.cpp +++ b/gfx/common/win32_common.cpp @@ -459,10 +459,9 @@ bool win32_set_video_mode(void *data, float refresh_mod; unsigned refresh; bool windowed_full; - RECT rect = {0}; - HMONITOR hm_to_use = NULL; - driver_t *driver = driver_get_ptr(); - settings_t *settings = config_get_ptr(); + RECT rect = {0}; + HMONITOR hm_to_use = NULL; + settings_t *settings = config_get_ptr(); win32_monitor_info(¤t_mon, &hm_to_use, &mon_id); diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index b7625a3254..51d88e2f51 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -358,7 +358,6 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info) unsigned width, height; bool ret = true; settings_t *settings = config_get_ptr(); - driver_t *driver = driver_get_ptr(); if (!d3d) return false; @@ -536,7 +535,6 @@ static bool d3d_construct(d3d_video_t *d3d, void **input_data) { unsigned full_x, full_y; - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); d3d->should_resize = false; @@ -1430,7 +1428,6 @@ static bool d3d_frame(void *data, const void *frame, unsigned i = 0; d3d_video_t *d3d = (d3d_video_t*)data; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); HWND window = win32_get_window(); diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c index cd975e8dc6..052e8b1fe6 100644 --- a/gfx/drivers/vita2d_gfx.c +++ b/gfx/drivers/vita2d_gfx.c @@ -80,8 +80,7 @@ typedef struct vita_video static void *vita2d_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data) { - vita_video_t *vita = (vita_video_t *)calloc(1, sizeof(vita_video_t)); - driver_t *driver = driver_get_ptr(); + vita_video_t *vita = (vita_video_t *)calloc(1, sizeof(vita_video_t)); settings_t *settings = config_get_ptr(); if (!vita) diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index c414b15a59..c73931a9ee 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -424,7 +424,6 @@ static void rgui_render(void) uint16_t *fb_data = NULL; rgui_t *rgui = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count); @@ -435,8 +434,6 @@ static void rgui_render(void) title_msg[0] = '\0'; timedate[0] = '\0'; - (void)driver; - if (!menu || !menu->userdata) return; diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp index c31f7cb9fb..165a26622c 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/rmenu_xui.cpp @@ -274,9 +274,7 @@ static void* rmenu_xui_init(void) video_info_t video_info = {0}; TypefaceDescriptor typeface = {0}; settings_t *settings = config_get_ptr(); - driver_t *driver = driver_get_ptr(); - menu_handle_t *menu = (menu_handle_t*) - calloc(1, sizeof(*menu)); + menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); if (!menu) return NULL; @@ -368,8 +366,7 @@ static void xui_render_message(const char *msg) size_t i = 0; size_t j = 0; struct string_list *list = NULL; - driver_t *driver = driver_get_ptr(); - d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(false); + d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(false); if (!d3d) return; @@ -408,10 +405,9 @@ static void rmenu_xui_frame(void) D3DXMATRIX matOrigView; LPDIRECT3DDEVICE d3dr; const char *message; - D3DVIEWPORT vp_full = {0}; - d3d_video_t *d3d = NULL; + D3DVIEWPORT vp_full = {0}; + d3d_video_t *d3d = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); if (!menu) return; diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 06a300de1a..bd172af348 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -967,15 +967,12 @@ static void zarch_frame(void) float coord_color[16]; float coord_color2[16]; zui_t *zui = NULL; - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); if (!menu) return; - (void)driver; - zui = (zui_t*)menu->userdata; zui->menu = menu; @@ -1125,7 +1122,6 @@ error: static void zarch_free(void *data) { menu_handle_t *menu = (menu_handle_t*)data; - driver_t *driver = driver_get_ptr(); zui_t *zui = (zui_t*)menu->userdata; if (!zui || !menu) @@ -1150,10 +1146,9 @@ static void zarch_context_bg_destroy(zui_t *zui) static void zarch_context_destroy(void) { menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); zui_t *zui = menu ? (zui_t*)menu->userdata : NULL; - if (!menu || !zui || !driver) + if (!menu || !zui) return; menu_display_free_main_font();