immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better handling of VSync errors

1008-fix
tomangelo2 2018-07-05 21:18:14 +02:00
parent 608d59f07b
commit 4bfada2ad6
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/app/app.cpp
View File

@ -817,13 +817,25 @@ bool CApplication::CreateVideoSurface()
int vsync = 0; int vsync = 0;
if (GetConfigFile().GetIntProperty("Setup", "VSync", vsync)) if (GetConfigFile().GetIntProperty("Setup", "VSync", vsync))
{ {
if (SDL_GL_SetSwapInterval(vsync) == -1) while (SDL_GL_SetSwapInterval(vsync) == -1)
{ {
GetLogger()->Warn("Adaptive sync not supported.\n"); switch(vsync)
vsync = 1; {
SDL_GL_SetSwapInterval(vsync); case -1: //failed with adaptive sync?
GetConfigFile().SetIntProperty("Setup", "VSync", vsync); GetLogger()->Warn("Adaptive sync not supported.\n");
vsync = 1;
break;
case 1: //failed with VSync enabled?
GetLogger()->Warn("Couldn't enable VSync.\n");
vsync = 0;
break;
case 0: //failed with VSync disabled?
GetLogger()->Warn("Couldn't disable VSync.\n");
vsync = 1;
break;
}
} }
GetConfigFile().SetIntProperty("Setup", "VSync", vsync);
GetLogger()->Info("Using Vsync: %s\n", (vsync == -1 ? "adaptive" : (vsync ? "true" : "false"))); GetLogger()->Info("Using Vsync: %s\n", (vsync == -1 ? "adaptive" : (vsync ? "true" : "false")));
} }
@ -838,12 +850,27 @@ bool CApplication::ChangeVideoConfig(const Gfx::DeviceConfig &newConfig)
// TODO: Somehow this doesn't work for maximized windows (at least on Ubuntu) // TODO: Somehow this doesn't work for maximized windows (at least on Ubuntu)
SDL_SetWindowSize(m_private->window, m_deviceConfig.size.x, m_deviceConfig.size.y); SDL_SetWindowSize(m_private->window, m_deviceConfig.size.x, m_deviceConfig.size.y);
SDL_SetWindowFullscreen(m_private->window, m_deviceConfig.fullScreen ? SDL_WINDOW_FULLSCREEN : 0); SDL_SetWindowFullscreen(m_private->window, m_deviceConfig.fullScreen ? SDL_WINDOW_FULLSCREEN : 0);
if( SDL_GL_SetSwapInterval(m_engine->GetVSync()) == -1 )
int vsync = m_engine->GetVSync();
while (SDL_GL_SetSwapInterval(vsync) == -1)
{ {
GetLogger()->Warn("Adaptive sync not supported.\n"); switch(vsync)
m_engine->SetVSync(1); {
SDL_GL_SetSwapInterval(1); case -1: //failed with adaptive sync?
GetLogger()->Warn("Adaptive sync not supported.\n");
vsync = 1;
break;
case 1: //failed with VSync enabled?
GetLogger()->Warn("Couldn't enable VSync.\n");
vsync = 0;
break;
case 0: //failed with VSync disabled?
GetLogger()->Warn("Couldn't disable VSync.\n");
vsync = 1;
break;
}
} }
m_engine->SetVSync(vsync);
m_device->ConfigChanged(m_deviceConfig); m_device->ConfigChanged(m_deviceConfig);