empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Andrea Odetti 2021-05-24 16:36:52 +01:00
commit c1276a3f12
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/frontends/sdl/main.cpp
View file

@ -69,6 +69,17 @@ namespace
return interval;
}
void setGLSwapInterval(const int interval)
{
const int current = SDL_GL_GetSwapInterval();
// in QEMU with GL_RENDERER: llvmpipe (LLVM 12.0.0, 256 bits)
// SDL_GL_SetSwapInterval() always fails
if (interval != current && SDL_GL_SetSwapInterval(interval))
{
throw std::runtime_error(std::string("SDL_GL_SetSwapInterval: ") + SDL_GetError());
}
}
}
void run_sdl(int argc, const char * argv [])
@ -107,10 +118,7 @@ void run_sdl(int argc, const char * argv [])
std::shared_ptr<Paddle> paddle(new sa2::Gamepad(0));
const Initialisation init(registry, frame, paddle);
if (SDL_GL_SetSwapInterval(options.glSwapInterval))
{
throw std::runtime_error(SDL_GetError());
}
std::cerr << "Default GL swap interval: " << SDL_GL_GetSwapInterval() << std::endl;
applyOptions(options);
@ -122,10 +130,7 @@ void run_sdl(int argc, const char * argv [])
{
// we need to switch off vsync, otherwise FPS is limited to 60
// and it will take longer to run
if (SDL_GL_SetSwapInterval(0))
{
throw std::runtime_error(SDL_GetError());
}
setGLSwapInterval(0);
const auto redraw = [&frame]{
frame->UpdateTexture();
@ -142,6 +147,8 @@ void run_sdl(int argc, const char * argv [])
}
else
{
setGLSwapInterval(options.glSwapInterval);
common2::Timer global;
common2::Timer updateTextureTimer;
common2::Timer refreshScreenTimer;