diff --git a/driver.h b/driver.h index 6bd901a0db..19d48c1921 100644 --- a/driver.h +++ b/driver.h @@ -201,7 +201,7 @@ typedef struct driver frontend_ctx_driver_t *frontend_ctx; const ui_companion_driver_t *ui_companion; const audio_driver_t *audio; - const video_driver_t *video; + const video_driver_t *current_video; const void *video_context; const input_driver_t *input; const camera_driver_t *camera; diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 938276f700..26e8d228d0 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -215,7 +215,7 @@ static bool find_video_driver(void) if (video_state.hw_render_callback.context_type) { RARCH_LOG("Using HW render, OpenGL driver forced.\n"); - driver->video = &video_gl; + driver->current_video = &video_gl; return true; } #endif @@ -223,16 +223,16 @@ static bool find_video_driver(void) if (driver->frontend_ctx && driver->frontend_ctx->get_video_driver) { - driver->video = driver->frontend_ctx->get_video_driver(); + driver->current_video = driver->frontend_ctx->get_video_driver(); - if (driver->video) + if (driver->current_video) return true; RARCH_WARN("Frontend supports get_video_driver() but did not specify one.\n"); } i = find_driver_index("video_driver", settings->video.driver); if (i >= 0) - driver->video = (const video_driver_t*)video_driver_find_handle(i); + driver->current_video = (const video_driver_t*)video_driver_find_handle(i); else { unsigned d; @@ -243,9 +243,9 @@ static bool find_video_driver(void) RARCH_LOG_OUTPUT("\t%s\n", video_driver_find_ident(d)); RARCH_WARN("Going to default to first video driver...\n"); - driver->video = (const video_driver_t*)video_driver_find_handle(0); + driver->current_video = (const video_driver_t*)video_driver_find_handle(0); - if (!driver->video) + if (!driver->current_video) retro_fail(1, "find_video_driver()"); } @@ -282,7 +282,7 @@ void *video_driver_get_ptr(void) #define video_driver_get_poke_ptr(driver) (driver) ? driver->video_poke : NULL -#define video_driver_ctx_get_ptr(driver) (driver) ? driver->video : NULL +#define video_driver_ctx_get_ptr(driver) (driver) ? driver->current_video : NULL const char *video_driver_get_ident(void) { @@ -520,9 +520,9 @@ static bool uninit_video_input(void) if ( !driver->video_data_own && driver->video_data && - driver->video && - driver->video->free) - driver->video->free(driver->video_data); + driver->current_video && + driver->current_video->free) + driver->current_video->free(driver->video_data); deinit_pixel_converter(); @@ -698,9 +698,9 @@ static bool init_video(void) /* Can't do hardware rendering with threaded driver currently. */ RARCH_LOG("Starting threaded video driver ...\n"); - if (!rarch_threaded_video_init(&driver->video, &driver->video_data, + if (!rarch_threaded_video_init(&driver->current_video, &driver->video_data, &driver->input, &driver->input_data, - driver->video, &video)) + driver->current_video, &video)) { RARCH_ERR("Cannot open threaded video driver ... Exiting ...\n"); goto error; @@ -708,7 +708,7 @@ static bool init_video(void) } else #endif - driver->video_data = driver->video->init(&video, &driver->input, + driver->video_data = driver->current_video->init(&video, &driver->input, &driver->input_data); if (!driver->video_data) @@ -718,10 +718,10 @@ static bool init_video(void) } driver->video_poke = NULL; - if (driver->video->poke_interface) - driver->video->poke_interface(driver->video_data, &driver->video_poke); + if (driver->current_video->poke_interface) + driver->current_video->poke_interface(driver->video_data, &driver->video_poke); - if (driver->video->viewport_info && (!custom_vp->width || + if (driver->current_video->viewport_info && (!custom_vp->width || !custom_vp->height)) { /* Force custom viewport to have sane parameters. */ diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index 27d7fcb2ca..98200d0d09 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -302,7 +302,7 @@ static void sdl_grab_mouse(void *data, bool state) sdl_input_t *sdl = (sdl_input_t*)data; driver_t *driver = driver_get_ptr(); - if (driver->video != &video_sdl2) + if (driver->current_video != &video_sdl2) return; /* First member of sdl2_video_t is the window */ diff --git a/libretro_version_1.c b/libretro_version_1.c index 04cf8e3d88..8ebb44c41c 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -60,7 +60,7 @@ static void video_frame(const void *data, unsigned width, global_t *global = global_get_ptr(); settings_t *settings = config_get_ptr(); const video_driver_t *video = - driver ? (const video_driver_t*)driver->video : NULL; + driver ? (const video_driver_t*)driver->current_video : NULL; if (!driver->video_active) return; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 04c84b8b61..9556dd90a2 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2742,7 +2742,6 @@ void general_write_handler(void *data) menu_displaylist_info_t info = {0}; rarch_setting_t *setting = (rarch_setting_t*)data; settings_t *settings = config_get_ptr(); - driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); rarch_system_info_t *system = rarch_system_info_get_ptr(); @@ -2817,13 +2816,10 @@ void general_write_handler(void *data) } break; case MENU_LABEL_VIDEO_REFRESH_RATE_AUTO: - if (driver->video && driver->video_data) - { - driver_set_refresh_rate(*setting->value.fraction); + driver_set_refresh_rate(*setting->value.fraction); - /* In case refresh rate update forced non-block video. */ - rarch_cmd = EVENT_CMD_VIDEO_SET_BLOCKING_STATE; - } + /* In case refresh rate update forced non-block video. */ + rarch_cmd = EVENT_CMD_VIDEO_SET_BLOCKING_STATE; break; case MENU_LABEL_VIDEO_SCALE: settings->video.scale = roundf(*setting->value.fraction); diff --git a/record/record_driver.c b/record/record_driver.c index 55d06bc51c..0b7a71f34b 100644 --- a/record/record_driver.c +++ b/record/record_driver.c @@ -317,7 +317,7 @@ bool recording_init(void) if (*global->record.config) params.config = global->record.config; - if (settings->video.gpu_record && driver->video->read_viewport) + if (settings->video.gpu_record && driver->current_video->read_viewport) { struct video_viewport vp = {0}; diff --git a/runloop.c b/runloop.c index 6dcdf8d3ae..4d3f6193af 100644 --- a/runloop.c +++ b/runloop.c @@ -73,8 +73,8 @@ static bool check_pause(driver_t *driver, settings_t *settings, bool focus = true; enum event_command cmd = EVENT_CMD_NONE; bool old_is_paused = main_is_paused; - const video_driver_t *video = driver ? (const video_driver_t*)driver->video : - NULL; + const video_driver_t *video = driver ? + (const video_driver_t*)driver->current_video : NULL; /* FRAMEADVANCE will set us into pause mode. */ pause_pressed |= !main_is_paused && frameadvance_pressed; @@ -873,7 +873,7 @@ static INLINE int rarch_main_iterate_time_to_exit(event_cmd_state_t *cmd) global_t *global = global_get_ptr(); driver_t *driver = driver_get_ptr(); rarch_system_info_t *system = rarch_system_info_get_ptr(); - video_driver_t *video = driver ? (video_driver_t*)driver->video : NULL; + video_driver_t *video = driver ? (video_driver_t*)driver->current_video : NULL; bool shutdown_pressed = (system && system->shutdown) || cmd->quit_key_pressed; bool video_alive = video && video->alive(driver->video_data); bool movie_end = (global->bsv.movie_end && global->bsv.eof_exit); diff --git a/screenshot.c b/screenshot.c index f50b709394..2d169aa14f 100644 --- a/screenshot.c +++ b/screenshot.c @@ -219,15 +219,15 @@ bool take_screenshot(void) viewport_read = (settings->video.gpu_screenshot || ((hw_render->context_type - != RETRO_HW_CONTEXT_NONE) && !driver->video->read_frame_raw)) - && driver->video->read_viewport && driver->video->viewport_info; + != RETRO_HW_CONTEXT_NONE) && !driver->current_video->read_frame_raw)) + && driver->current_video->read_viewport && driver->current_video->viewport_info; if (viewport_read) { /* Avoid taking screenshot of GUI overlays. */ video_driver_set_texture_enable(false, false); - if (driver->video) + if (driver->current_video) video_driver_ctl(RARCH_DISPLAY_CTL_CACHED_FRAME_RENDER, NULL); } @@ -235,7 +235,7 @@ bool take_screenshot(void) ret = take_screenshot_viewport(); else if (!video_driver_ctl(RARCH_DISPLAY_CTL_CACHED_FRAME_HAS_VALID_FB, NULL)) ret = take_screenshot_raw(); - else if (driver->video->read_frame_raw) + else if (driver->current_video->read_frame_raw) { unsigned old_width, old_height; size_t old_pitch;