mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-24 15:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Buildfixes

Browse Source
This commit is contained in:
twinaphex 2017-04-29 18:30:23 +02:00
parent dd83b4a043
commit 7bdef1fde4
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/video_driver.c
View File

@ -590,7 +590,9 @@ static void video_driver_pixel_converter_free(void)
static void video_driver_free_internal(void) static void video_driver_free_internal(void)
{ {
#ifdef HAVE_THREADS
bool is_threaded = video_driver_is_threaded(); bool is_threaded = video_driver_is_threaded();
#endif
command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); command_event(CMD_EVENT_OVERLAY_DEINIT, NULL);
@ -615,8 +617,10 @@ static void video_driver_free_internal(void)
command_event(CMD_EVENT_SHADER_DIR_DEINIT, NULL); command_event(CMD_EVENT_SHADER_DIR_DEINIT, NULL);
#ifdef HAVE_THREADS
if (is_threaded) if (is_threaded)
return; return;
#endif
video_driver_monitor_compute_fps_statistics(); video_driver_monitor_compute_fps_statistics();
} }
@ -994,26 +998,32 @@ void video_driver_cached_frame_get(const void **data, unsigned *width,
void video_driver_get_size(unsigned *width, unsigned *height) void video_driver_get_size(unsigned *width, unsigned *height)
{ {
#ifdef HAVE_THREADS
bool is_threaded = video_driver_is_threaded(); bool is_threaded = video_driver_is_threaded();
video_driver_threaded_lock(is_threaded); video_driver_threaded_lock(is_threaded);
#endif
if (width) if (width)
*width = video_driver_width; *width = video_driver_width;
if (height) if (height)
*height = video_driver_height; *height = video_driver_height;
#ifdef HAVE_THREADS
video_driver_threaded_unlock(is_threaded); video_driver_threaded_unlock(is_threaded);
#endif
} }
void video_driver_set_size(unsigned *width, unsigned *height) void video_driver_set_size(unsigned *width, unsigned *height)
{ {
#ifdef HAVE_THREADS
bool is_threaded = video_driver_is_threaded(); bool is_threaded = video_driver_is_threaded();
video_driver_threaded_lock(is_threaded); video_driver_threaded_lock(is_threaded);
#endif
if (width) if (width)
video_driver_width = *width; video_driver_width = *width;
if (height) if (height)
video_driver_height = *height; video_driver_height = *height;
#ifdef HAVE_THREADS
video_driver_threaded_unlock(is_threaded); video_driver_threaded_unlock(is_threaded);
#endif
} }
/** /**
@ -2245,9 +2255,11 @@ void video_driver_build_info(video_frame_info_t *video_info)
bool is_paused = false; bool is_paused = false;
bool is_idle = false; bool is_idle = false;
bool is_slowmotion = false; bool is_slowmotion = false;
bool is_threaded = video_driver_is_threaded();
settings_t *settings = NULL; settings_t *settings = NULL;
#ifdef HAVE_THREADS
bool is_threaded = video_driver_is_threaded();
video_driver_threaded_lock(is_threaded); video_driver_threaded_lock(is_threaded);
#endif
settings = config_get_ptr(); settings = config_get_ptr();
video_info->refresh_rate = settings->floats.video_refresh_rate; video_info->refresh_rate = settings->floats.video_refresh_rate;
video_info->black_frame_insertion = video_info->black_frame_insertion =
@ -2322,7 +2334,9 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->runloop_is_paused = is_paused; video_info->runloop_is_paused = is_paused;
video_info->runloop_is_idle = is_idle; video_info->runloop_is_idle = is_idle;
video_info->runloop_is_slowmotion = is_slowmotion; video_info->runloop_is_slowmotion = is_slowmotion;
#ifdef HAVE_THREADS
video_driver_threaded_unlock(is_threaded); video_driver_threaded_unlock(is_threaded);
#endif
} }
/** /**