libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cut down on some more superfluous wrapper functions

Browse Source
This commit is contained in:
twinaphex 2015-07-12 11:28:19 +02:00
parent 19542d4f00
commit 2aac64552d
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/video_driver.c
View File

@ -324,22 +324,6 @@ retro_proc_address_t video_driver_get_proc_address(const char *sym)
return NULL;
}
bool video_driver_is_alive(void)
{
driver_t *driver = driver_get_ptr();
const video_driver_t *video = video_driver_ctx_get_ptr();
return video->alive(driver->video_data);
}
bool video_driver_has_focus(void)
{
driver_t *driver = driver_get_ptr();
const video_driver_t *video = video_driver_ctx_get_ptr();
return video->focus(driver->video_data);
}
bool video_driver_set_shader(enum rarch_shader_type type,
const char *path)
{

4
gfx/video_driver.h
View File

@ -271,10 +271,6 @@ uintptr_t video_driver_get_current_framebuffer(void);
retro_proc_address_t video_driver_get_proc_address(const char *sym);
bool video_driver_is_alive(void);
bool video_driver_has_focus(void);
bool video_driver_set_shader(enum rarch_shader_type type,
const char *shader);

9
runloop.c
View File

@ -63,12 +63,15 @@ static bool check_pause(bool pause_pressed, bool frameadvance_pressed)
enum event_command cmd = EVENT_CMD_NONE;
bool old_is_paused = runloop ? runloop->is_paused : false;
settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr();
const video_driver_t *video = driver ? (const video_driver_t*)driver->video :
NULL;
/* FRAMEADVANCE will set us into pause mode. */
pause_pressed |= !runloop->is_paused && frameadvance_pressed;
if (settings->pause_nonactive)
focus = video_driver_has_focus();
focus = video->focus(driver->video_data);
if (focus && pause_pressed)
cmd = EVENT_CMD_PAUSE_TOGGLE;
@ -635,10 +638,12 @@ static int do_state_checks(event_cmd_state_t *cmd)
static INLINE int time_to_exit(event_cmd_state_t *cmd)
{
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
const video_driver_t *video = driver ? (const video_driver_t*)driver->video : NULL;
global_t *global = global_get_ptr();
rarch_system_info_t *system = rarch_system_info_get_ptr();
bool shutdown_pressed = system->shutdown;
bool video_alive = video_driver_is_alive();
bool video_alive = video->alive(driver->video_data);
bool movie_end = (global->bsv.movie_end && global->bsv.eof_exit);
uint64_t frame_count = video_driver_get_frame_count();
bool frame_count_end = (runloop->frames.video.max &&