mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename driver->video

Browse Source
This commit is contained in:
twinaphex 2015-11-23 14:14:12 +01:00
parent 8e0a2ee9e7
commit 9b41061143
8 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver.h
View File

@ -201,7 +201,7 @@ typedef struct driver
frontend_ctx_driver_t *frontend_ctx; frontend_ctx_driver_t *frontend_ctx;
const ui_companion_driver_t *ui_companion; const ui_companion_driver_t *ui_companion;
const audio_driver_t *audio; const audio_driver_t *audio;
const video_driver_t *video; const video_driver_t *current_video;
const void *video_context; const void *video_context;
const input_driver_t *input; const input_driver_t *input;
const camera_driver_t *camera; const camera_driver_t *camera;

32
gfx/video_driver.c
View File

@ -215,7 +215,7 @@ static bool find_video_driver(void)
if (video_state.hw_render_callback.context_type) if (video_state.hw_render_callback.context_type)
{ {
RARCH_LOG("Using HW render, OpenGL driver forced.\n"); RARCH_LOG("Using HW render, OpenGL driver forced.\n");
driver->video = &video_gl; driver->current_video = &video_gl;
return true; return true;
} }
#endif #endif
@ -223,16 +223,16 @@ static bool find_video_driver(void)
if (driver->frontend_ctx && if (driver->frontend_ctx &&
driver->frontend_ctx->get_video_driver) 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; return true;
RARCH_WARN("Frontend supports get_video_driver() but did not specify one.\n"); RARCH_WARN("Frontend supports get_video_driver() but did not specify one.\n");
} }
i = find_driver_index("video_driver", settings->video.driver); i = find_driver_index("video_driver", settings->video.driver);
if (i >= 0) 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 else
{ {
unsigned d; unsigned d;
@ -243,9 +243,9 @@ static bool find_video_driver(void)
RARCH_LOG_OUTPUT("\t%s\n", video_driver_find_ident(d)); RARCH_LOG_OUTPUT("\t%s\n", video_driver_find_ident(d));
RARCH_WARN("Going to default to first video driver...\n"); 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()"); 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_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) const char *video_driver_get_ident(void)
{ {
@ -520,9 +520,9 @@ static bool uninit_video_input(void)
if ( if (
!driver->video_data_own && !driver->video_data_own &&
driver->video_data && driver->video_data &&
driver->video && driver->current_video &&
driver->video->free) driver->current_video->free)
driver->video->free(driver->video_data); driver->current_video->free(driver->video_data);
deinit_pixel_converter(); deinit_pixel_converter();
@ -698,9 +698,9 @@ static bool init_video(void)
/* Can't do hardware rendering with threaded driver currently. */ /* Can't do hardware rendering with threaded driver currently. */
RARCH_LOG("Starting threaded video driver ...\n"); 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->input, &driver->input_data,
driver->video, &video)) driver->current_video, &video))
{ {
RARCH_ERR("Cannot open threaded video driver ... Exiting ...\n"); RARCH_ERR("Cannot open threaded video driver ... Exiting ...\n");
goto error; goto error;
@ -708,7 +708,7 @@ static bool init_video(void)
} }
else else
#endif #endif
driver->video_data = driver->video->init(&video, &driver->input, driver->video_data = driver->current_video->init(&video, &driver->input,
&driver->input_data); &driver->input_data);
if (!driver->video_data) if (!driver->video_data)
@ -718,10 +718,10 @@ static bool init_video(void)
} }
driver->video_poke = NULL; driver->video_poke = NULL;
if (driver->video->poke_interface) if (driver->current_video->poke_interface)
driver->video->poke_interface(driver->video_data, &driver->video_poke); 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)) !custom_vp->height))
{ {
/* Force custom viewport to have sane parameters. */ /* Force custom viewport to have sane parameters. */

2
input/drivers/sdl_input.c
View File

@ -302,7 +302,7 @@ static void sdl_grab_mouse(void *data, bool state)
sdl_input_t *sdl = (sdl_input_t*)data; sdl_input_t *sdl = (sdl_input_t*)data;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
if (driver->video != &video_sdl2) if (driver->current_video != &video_sdl2)
return; return;
/* First member of sdl2_video_t is the window */ /* First member of sdl2_video_t is the window */

2
libretro_version_1.c
View File

@ -60,7 +60,7 @@ static void video_frame(const void *data, unsigned width,
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const video_driver_t *video = 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) if (!driver->video_active)
return; return;

10
menu/menu_setting.c
View File

@ -2742,7 +2742,6 @@ void general_write_handler(void *data)
menu_displaylist_info_t info = {0}; menu_displaylist_info_t info = {0};
rarch_setting_t *setting = (rarch_setting_t*)data; rarch_setting_t *setting = (rarch_setting_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
rarch_system_info_t *system = rarch_system_info_get_ptr(); rarch_system_info_t *system = rarch_system_info_get_ptr();
@ -2817,13 +2816,10 @@ void general_write_handler(void *data)
} }
break; break;
case MENU_LABEL_VIDEO_REFRESH_RATE_AUTO: 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. */ /* In case refresh rate update forced non-block video. */
rarch_cmd = EVENT_CMD_VIDEO_SET_BLOCKING_STATE; rarch_cmd = EVENT_CMD_VIDEO_SET_BLOCKING_STATE;
}
break; break;
case MENU_LABEL_VIDEO_SCALE: case MENU_LABEL_VIDEO_SCALE:
settings->video.scale = roundf(*setting->value.fraction); settings->video.scale = roundf(*setting->value.fraction);

2
record/record_driver.c
View File

@ -317,7 +317,7 @@ bool recording_init(void)
if (*global->record.config) if (*global->record.config)
params.config = 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}; struct video_viewport vp = {0};

6
runloop.c
View File

@ -73,8 +73,8 @@ static bool check_pause(driver_t *driver, settings_t *settings,
bool focus = true; bool focus = true;
enum event_command cmd = EVENT_CMD_NONE; enum event_command cmd = EVENT_CMD_NONE;
bool old_is_paused = main_is_paused; bool old_is_paused = main_is_paused;
const video_driver_t *video = driver ? (const video_driver_t*)driver->video : const video_driver_t *video = driver ?
NULL; (const video_driver_t*)driver->current_video : NULL;
/* FRAMEADVANCE will set us into pause mode. */ /* FRAMEADVANCE will set us into pause mode. */
pause_pressed |= !main_is_paused && frameadvance_pressed; 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(); global_t *global = global_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
rarch_system_info_t *system = rarch_system_info_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 shutdown_pressed = (system && system->shutdown) || cmd->quit_key_pressed;
bool video_alive = video && video->alive(driver->video_data); bool video_alive = video && video->alive(driver->video_data);
bool movie_end = (global->bsv.movie_end && global->bsv.eof_exit); bool movie_end = (global->bsv.movie_end && global->bsv.eof_exit);

8
screenshot.c
View File

@ -219,15 +219,15 @@ bool take_screenshot(void)
viewport_read = (settings->video.gpu_screenshot || viewport_read = (settings->video.gpu_screenshot ||
((hw_render->context_type ((hw_render->context_type
!= RETRO_HW_CONTEXT_NONE) && !driver->video->read_frame_raw)) != RETRO_HW_CONTEXT_NONE) && !driver->current_video->read_frame_raw))
&& driver->video->read_viewport && driver->video->viewport_info; && driver->current_video->read_viewport && driver->current_video->viewport_info;
if (viewport_read) if (viewport_read)
{ {
/* Avoid taking screenshot of GUI overlays. */ /* Avoid taking screenshot of GUI overlays. */
video_driver_set_texture_enable(false, false); video_driver_set_texture_enable(false, false);
if (driver->video) if (driver->current_video)
video_driver_ctl(RARCH_DISPLAY_CTL_CACHED_FRAME_RENDER, NULL); video_driver_ctl(RARCH_DISPLAY_CTL_CACHED_FRAME_RENDER, NULL);
} }
@ -235,7 +235,7 @@ bool take_screenshot(void)
ret = take_screenshot_viewport(); ret = take_screenshot_viewport();
else if (!video_driver_ctl(RARCH_DISPLAY_CTL_CACHED_FRAME_HAS_VALID_FB, NULL)) else if (!video_driver_ctl(RARCH_DISPLAY_CTL_CACHED_FRAME_HAS_VALID_FB, NULL))
ret = take_screenshot_raw(); ret = take_screenshot_raw();
else if (driver->video->read_frame_raw) else if (driver->current_video->read_frame_raw)
{ {
unsigned old_width, old_height; unsigned old_width, old_height;
size_t old_pitch; size_t old_pitch;