This commit is contained in:
twinaphex 2017-04-29 18:33:50 +02:00
parent 7bdef1fde4
commit c147604103

View File

@ -65,6 +65,12 @@
#define FPS_UPDATE_INTERVAL 256
#ifdef HAVE_THREADS
#define video_driver_is_threaded() ((!video_driver_is_hw_context() && video_driver_threaded) ? true : false)
#else
#define video_driver_is_threaded() (false)
#endif
#ifdef HAVE_THREADS
#define video_driver_lock() \
if (display_lock) \
@ -88,12 +94,6 @@
display_lock = NULL; \
context_lock = NULL
#ifdef HAVE_THREADS
#define video_driver_is_threaded() ((!video_driver_is_hw_context() && video_driver_threaded) ? true : false)
#else
#define video_driver_is_threaded() (false)
#endif
#define video_driver_threaded_lock(is_threaded) \
if (is_threaded) \
video_driver_lock()
@ -1069,8 +1069,12 @@ bool video_monitor_fps_statistics(double *refresh_rate,
retro_time_t accum = 0, avg, accum_var = 0;
unsigned samples = MIN(MEASURE_FRAME_TIME_SAMPLES_COUNT,
(unsigned)video_driver_frame_time_count);
#ifdef HAVE_THREADS
if (video_driver_is_threaded())
return false;
#endif
if (video_driver_is_threaded() || (samples < 2))
if (samples < 2)
return false;
/* Measure statistics on frame time (microsecs), *not* FPS. */