From e5ca68a518767e452cbe5f52168422fdd6dd1be9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 21 Mar 2021 17:33:44 +0100 Subject: [PATCH] Simplify video_driver_get_ptr --- frontend/drivers/platform_wiiu.c | 2 +- gfx/common/win32_common.c | 4 ++-- gfx/gfx_display.c | 2 +- input/drivers/qnx_input.c | 2 +- input/drivers/sdl_input.c | 2 +- menu/menu_setting.c | 2 +- retroarch.c | 12 ++++++------ retroarch.h | 2 +- retroarch_data.h | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frontend/drivers/platform_wiiu.c b/frontend/drivers/platform_wiiu.c index 887543f4ef..03e028a872 100644 --- a/frontend/drivers/platform_wiiu.c +++ b/frontend/drivers/platform_wiiu.c @@ -452,7 +452,7 @@ static void main_loop(void) for (;;) { - if (video_driver_get_ptr(false)) + if (video_driver_get_ptr()) { start_time = OSGetSystemTime(); task_queue_wait(swap_is_pending, &start_time); diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c index 2208fd8118..5a525d08ef 100644 --- a/gfx/common/win32_common.c +++ b/gfx/common/win32_common.c @@ -1286,7 +1286,7 @@ LRESULT CALLBACK wnd_proc_gdi_dinput(HWND hwnd, UINT message, } else if (message == WM_PAINT) { - gdi_t *gdi = (gdi_t*)video_driver_get_ptr(false); + gdi_t *gdi = (gdi_t*)video_driver_get_ptr(); if (gdi && gdi->memDC) { @@ -1334,7 +1334,7 @@ LRESULT CALLBACK wnd_proc_gdi_common(HWND hwnd, UINT message, } else if (message == WM_PAINT) { - gdi_t *gdi = (gdi_t*)video_driver_get_ptr(false); + gdi_t *gdi = (gdi_t*)video_driver_get_ptr(); if (gdi && gdi->memDC) { diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c index 314788eea6..1fa8140ae4 100644 --- a/gfx/gfx_display.c +++ b/gfx/gfx_display.c @@ -629,7 +629,7 @@ font_data_t *gfx_display_font_file( font_size = 2.0f; if (!dispctx->font_init_first((void**)&font_data, - video_driver_get_ptr(false), + video_driver_get_ptr(), fontpath, font_size, is_threaded)) return NULL; diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c index 03bef1fd74..85b6df4276 100644 --- a/input/drivers/qnx_input.c +++ b/input/drivers/qnx_input.c @@ -500,7 +500,7 @@ static void qnx_process_touch_event( vp.full_height = 0; #if 0 - gl_t *gl = (gl_t*)video_driver_get_ptr(false); + gl_t *gl = (gl_t*)video_driver_get_ptr(); /*During a move, we can go ~30 pixel into the * bezel which gives negative numbers or diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index bb763635b4..6c23df8282 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -287,7 +287,7 @@ static void sdl2_grab_mouse(void *data, bool state) return; /* First member of sdl2_video_t is the window */ - SDL_SetWindowGrab(((struct temp*)video_driver_get_ptr(false))->w, + SDL_SetWindowGrab(((struct temp*)video_driver_get_ptr())->w, state ? SDL_TRUE : SDL_FALSE); } #endif diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 06fcd5968e..e0ee64fa95 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -7673,7 +7673,7 @@ static void change_handler_video_layout_enable(rarch_setting_t *setting) if (*setting->value.target.boolean) { settings_t *settings = config_get_ptr(); - void *driver = video_driver_get_ptr(false); + void *driver = video_driver_get_ptr(); video_layout_init(driver, video_driver_layout_render_interface()); video_layout_load(settings->paths.path_video_layout); diff --git a/retroarch.c b/retroarch.c index 3fc37607b9..17d81da4e8 100644 --- a/retroarch.c +++ b/retroarch.c @@ -429,10 +429,10 @@ static void *video_thread_get_ptr(struct rarch_state *p_rarch) * * Returns: video driver's userdata. **/ -void *video_driver_get_ptr(bool force_nonthreaded_data) +void *video_driver_get_ptr(void) { struct rarch_state *p_rarch = &rarch_st; - return VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch, force_nonthreaded_data); + return VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch); } void *video_driver_get_data(void) @@ -29495,7 +29495,7 @@ const char *video_driver_get_ident(void) #ifdef HAVE_THREADS if (VIDEO_DRIVER_IS_THREADED_INTERNAL()) { - const thread_video_t *thr = (const thread_video_t*)VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch, true); + const thread_video_t *thr = (const thread_video_t*)p_rarch->video_driver_data; if (!thr || !thr->driver) return NULL; return thr->driver->ident; @@ -31822,7 +31822,7 @@ void video_driver_build_info(video_frame_info_t *video_info) video_info->input_driver_nonblock_state = p_rarch->input_driver_nonblock_state; video_info->input_driver_grab_mouse_state = p_rarch->input_driver_grab_mouse_state; - video_info->userdata = VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch, false); + video_info->userdata = VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch); #ifdef HAVE_THREADS VIDEO_DRIVER_THREADED_UNLOCK(is_threaded); @@ -32672,7 +32672,7 @@ static void driver_adjust_system_rates(struct rarch_state *p_rarch) video_driver_monitor_adjust_system_rates(p_rarch); - if (!VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch, false)) + if (!VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch)) return; if (p_rarch->runloop_force_nonblock) @@ -32714,7 +32714,7 @@ void driver_set_nonblock_state(void) bool runloop_force_nonblock = p_rarch->runloop_force_nonblock; /* Only apply non-block-state for video if we're using vsync. */ - if (video_driver_active && VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch, false)) + if (video_driver_active && VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch)) { if (p_rarch->current_video->set_nonblock_state) { diff --git a/retroarch.h b/retroarch.h index 3b4ae88875..d1fa75a673 100644 --- a/retroarch.h +++ b/retroarch.h @@ -1583,7 +1583,7 @@ const char* config_get_video_driver_options(void); * * Returns: video driver's userdata. **/ -void *video_driver_get_ptr(bool force_nonthreaded_data); +void *video_driver_get_ptr(void); void *video_driver_get_data(void); diff --git a/retroarch_data.h b/retroarch_data.h index e68309e1b5..02d4f755a1 100644 --- a/retroarch_data.h +++ b/retroarch_data.h @@ -157,9 +157,9 @@ #endif #ifdef HAVE_THREADS -#define VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch, force) ((VIDEO_DRIVER_IS_THREADED_INTERNAL() && !force) ? video_thread_get_ptr(p_rarch) : p_rarch->video_driver_data) +#define VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch) ((VIDEO_DRIVER_IS_THREADED_INTERNAL()) ? video_thread_get_ptr(p_rarch) : p_rarch->video_driver_data) #else -#define VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch, force) (p_rarch->video_driver_data) +#define VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch) (p_rarch->video_driver_data) #endif #define VIDEO_DRIVER_GET_HW_CONTEXT_INTERNAL(p_rarch) (&p_rarch->hw_render)