Ancurio/mkxp-freebird
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Graphics: Check for nanosleep errors, disable on Windows (for now)

Browse source
This commit is contained in:
Jonas Kulla 2014-06-11 03:09:29 +02:00
parent 06b218d5d7
commit aed7ba6672
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/graphics.cpp
View file

@ -34,6 +34,7 @@
#include "etc-internal.h" #include "etc-internal.h"
#include "binding.h" #include "binding.h"
#include "perftimer.h" #include "perftimer.h"
#include "debugwriter.h"
#include <SDL_video.h> #include <SDL_video.h>
#include <SDL_timer.h> #include <SDL_timer.h>
@ -41,6 +42,7 @@
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <errno.h>
#include <algorithm> #include <algorithm>
struct PingPong struct PingPong
@ -237,6 +239,9 @@ private:
#endif #endif
}; };
/* Nanoseconds per second */
#define NS_PER_S 1000000000
struct FPSLimiter struct FPSLimiter
{ {
uint64_t lastTickCount; uint64_t lastTickCount;
@ -271,7 +276,7 @@ struct FPSLimiter
: lastTickCount(SDL_GetPerformanceCounter()), : lastTickCount(SDL_GetPerformanceCounter()),
tickFreq(SDL_GetPerformanceFrequency()), tickFreq(SDL_GetPerformanceFrequency()),
tickFreqMS(tickFreq / 1000), tickFreqMS(tickFreq / 1000),
tickFreqNS(tickFreq / 1000000000), tickFreqNS(tickFreq / NS_PER_S),
disabled(false) disabled(false)
{ {
setDesiredFPS(desiredFPS); setDesiredFPS(desiredFPS);
@ -338,12 +343,25 @@ struct FPSLimiter
private: private:
void delayTicks(uint64_t ticks) void delayTicks(uint64_t ticks)
{ {
#ifdef HAVE_NANOSLEEP #if defined(HAVE_NANOSLEEP) && !defined(_WIN32)
struct timespec req; struct timespec req;
req.tv_sec = 0; uint64_t nsec = ticks / tickFreqNS;
req.tv_nsec = ticks / tickFreqNS; req.tv_sec = nsec / NS_PER_S;
req.tv_nsec = nsec % NS_PER_S;
errno = 0;
while (nanosleep(&req, &req) == -1) while (nanosleep(&req, &req) == -1)
; {
int err = errno;
errno = 0;
if (err == EINTR)
continue;
Debug() << "nanosleep failed. errno:" << err;
SDL_Delay(ticks / tickFreqMS);
break;
}
#else #else
SDL_Delay(ticks / tickFreqMS); SDL_Delay(ticks / tickFreqMS);
#endif #endif