Windows|GL|Client: Update Qt to control swap interval (vsync)

IssueID #1712
skyjake · Mar 16, 2014 · 33de83f · 33de83f
1 parent 8d16231
commit 33de83f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/doomsday/client/src/gl/gl_main.cpp b/doomsday/client/src/gl/gl_main.cpp
@@ -97,14 +97,18 @@ static viewport_t currentView;
 static void videoFSAAChanged()
 {
     if(novideo || !WindowSystem::mainExists()) return;
-    ClientWindowSystem::main().updateCanvasFormat();
+    ClientWindow::main().updateCanvasFormat();
 }
 
 static void videoVsyncChanged()
 {
     if(novideo || !WindowSystem::mainExists()) return;
 
+#ifdef WIN32
+    ClientWindow::main().updateCanvasFormat();
+#else
     GL_SetVSync(Con_GetByte("vid-vsync") != 0);
+#endif
 }
 
 void GL_Register()

diff --git a/doomsday/client/src/ui/clientwindow.cpp b/doomsday/client/src/ui/clientwindow.cpp
@@ -862,18 +862,16 @@ bool ClientWindow::setDefaultGLFormat() // static
         fmt.setStereo(true);
     }
 
-    /*
+#ifdef WIN32
     if(CommandLine_Exists("-novsync") || !Con_GetByte("vid-vsync"))
     {
-        fmt.setSwapInterval(0); // vsync off
-        LOG_GL_VERBOSE("Vertical sync off");
+        fmt.setSwapInterval(0);
     }
     else
     {
         fmt.setSwapInterval(1);
-        LOG_GL_VERBOSE("Vertical sync on");
     }
-    */
+#endif
 
     // The value of the "vid-fsaa" variable is written to this settings
     // key when the value of the variable changes.