SDL: Support VSync with OpenGL in SDL1 builds

madmoose · Jan 16, 2023 · 40f797f · 40f797f
1 parent 138a983
commit 40f797f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -134,9 +134,7 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(SdlEventSource *eventSource,
 	_glContextType = OpenGL::kContextGL;
 #endif
 
-#if SDL_VERSION_ATLEAST(2, 0, 0)
 	_vsync = ConfMan.getBool("vsync");
-#endif
 
 	// Retrieve a list of working fullscreen modes
 	Common::Rect desktopRes = _window->getDesktopResolution();
@@ -199,9 +197,9 @@ bool OpenGLSdlGraphicsManager::hasFeature(OSystem::Feature f) const {
 	switch (f) {
 	case OSystem::kFeatureFullscreenMode:
 	case OSystem::kFeatureIconifyWindow:
+	case OSystem::kFeatureVSync:
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	case OSystem::kFeatureFullscreenToggleKeepsContext:
-	case OSystem::kFeatureVSync:
 #endif
 		return true;
 
@@ -217,12 +215,10 @@ void OpenGLSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
 		_wantsFullScreen = enable;
 		break;
 
-#if SDL_VERSION_ATLEAST(2, 0, 0)
 	case OSystem::kFeatureVSync:
 		assert(getTransactionMode() != kTransactionNone);
 		_vsync = enable;
 		break;
-#endif
 
 	case OSystem::kFeatureIconifyWindow:
 		if (enable) {
@@ -251,10 +247,9 @@ bool OpenGLSdlGraphicsManager::getFeatureState(OSystem::Feature f) const {
 			return _wantsFullScreen;
 		}
 #endif
-#if SDL_VERSION_ATLEAST(2, 0, 0)
+
 	case OSystem::kFeatureVSync:
 		return _vsync;
-#endif
 
 	default:
 		return OpenGLGraphicsManager::getFeatureState(f);
@@ -598,6 +593,8 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		notifyContextDestroy();
 	}
 
+	SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, _vsync ? 1 : 0);
+
 	_hwScreen = SDL_SetVideoMode(width, height, 32, flags);
 
 	if (!_hwScreen) {

diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h
@@ -76,9 +76,7 @@ class OpenGLSdlGraphicsManager : public OpenGL::OpenGLGraphicsManager, public Sd
 	uint _graphicsScale;
 	bool _gotResize;
 
-#if SDL_VERSION_ATLEAST(2, 0, 0)
 	bool _vsync;
-#endif
 	bool _wantsFullScreen;
 	uint _ignoreResizeEvents;