From 9b65f0dbca5ecb467221e926a9630ce80bb7aaab Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Mon, 18 Mar 2019 19:21:07 +0300
Subject: [PATCH] Vsync tweaks

Try to use adaptive vsync if available
Don't use vsync if unavailable
---
 components/sdlutil/sdlgraphicswindow.cpp | 24 ++++++++++++++++++++++--
 components/sdlutil/sdlgraphicswindow.hpp |  3 +++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index dc6129e43f..3b76e6887c 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -113,7 +113,7 @@ void GraphicsWindowSDL2::init()
         return;
     }
 
-    SDL_GL_SetSwapInterval(_traits->vsync ? 1 : 0);
+    setSwapInterval(_traits->vsync);
 
     SDL_GL_MakeCurrent(oldWin, oldCtx);
 
@@ -194,11 +194,31 @@ void GraphicsWindowSDL2::setSyncToVBlank(bool on)
 
     SDL_GL_MakeCurrent(mWindow, mContext);
 
-    SDL_GL_SetSwapInterval(on ? 1 : 0);
+    setSwapInterval(on);
 
     SDL_GL_MakeCurrent(oldWin, oldCtx);
 }
 
+void GraphicsWindowSDL2::setSwapInterval(bool enable)
+{
+    if (enable)
+    {
+        if (SDL_GL_SetSwapInterval(-1) == -1)
+        {
+            OSG_NOTICE << "Adaptive vsync unsupported" << std::endl;
+            if (SDL_GL_SetSwapInterval(1) == -1)
+            {
+                OSG_NOTICE << "Vertical synchronization unsupported, disabling" << std::endl;
+                SDL_GL_SetSwapInterval(0);
+            }
+        }
+    }
+    else
+    {
+        SDL_GL_SetSwapInterval(0);
+    }
+}
+
 void GraphicsWindowSDL2::raiseWindow()
 {
     SDL_RaiseWindow(mWindow);
diff --git a/components/sdlutil/sdlgraphicswindow.hpp b/components/sdlutil/sdlgraphicswindow.hpp
index 4b48b40732..dd8076776d 100644
--- a/components/sdlutil/sdlgraphicswindow.hpp
+++ b/components/sdlutil/sdlgraphicswindow.hpp
@@ -80,6 +80,9 @@ public:
 
         SDL_Window *mWindow;
     };
+
+private:
+    void setSwapInterval(bool enable);
 };
 
 }