Client|macOS: Re-enable runtime vsync changes on macOS

Also cleaned up some older code.
skyjake · Oct 11, 2016 · ca1b1c4 · ca1b1c4
1 parent 4888bba
commit ca1b1c4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/doomsday/apps/client/CMakeLists.txt b/doomsday/apps/client/CMakeLists.txt
@@ -113,6 +113,7 @@ relaxed_warnings (client)
 target_link_libraries (client PUBLIC Deng::libappfw Deng::libdoomsday)
 if (APPLE)
     link_framework (client PUBLIC Cocoa)
+    link_framework (client PUBLIC OpenGL)
     if (DENG_HAVE_QTKIT)
         link_framework (client PUBLIC QTKit) # MusicPlayer
     endif ()

diff --git a/doomsday/apps/client/include/ui/clientwindow.h b/doomsday/apps/client/include/ui/clientwindow.h
@@ -161,7 +161,7 @@ class ClientWindow : public de::BaseWindow
     void fadeInTaskBarBlur(de::TimeDelta span);
     void fadeOutTaskBarBlur(de::TimeDelta span);
 
-    void updateCanvasFormat();
+    //void updateCanvasFormat();
     void updateRootSize();
 
     // Notifications.

diff --git a/doomsday/apps/client/src/gl/dgl_common.cpp b/doomsday/apps/client/src/gl/dgl_common.cpp
@@ -321,36 +321,36 @@ void GL_ModulateTexture(int mode)
 void GL_SetVSync(dd_bool on)
 {
     // Outside the main thread we'll need to defer the call.
-    if(!Sys_InMainThread())
+    if (!Sys_InMainThread())
     {
         GL_DeferSetVSync(on);
         return;
     }
 
-    if(!GL_state.features.vsync) return;
+    if (!GL_state.features.vsync) return;
 
-    /// @todo Manage vsync via QSurfaceFormat.
-    qDebug() << "GL_SetVSync:" << on << "(not implemented)";
-/*
-#ifdef WIN32
-    wglSwapIntervalEXT(on? 1 : 0);
+    DENG_ASSERT_GL_CONTEXT_ACTIVE();
 
-#elif defined(MACOSX)
+#ifdef WIN32
+    {
+        //wglSwapIntervalEXT(on? 1 : 0);
+    }
+#elif defined (MACOSX)
     {
         // Tell CGL to wait for vertical refresh.
         CGLContextObj context = CGLGetCurrentContext();
-        assert(context != 0);
-        if(context)
+        DENG_ASSERT(context != nullptr);
+        if (context)
         {
             GLint params[1] = { on? 1 : 0 };
             CGLSetParameter(context, kCGLCPSwapInterval, params);
         }
     }
-
-#elif defined(Q_WS_X11)
-    setXSwapInterval(on? 1 : 0);
+#elif defined (Q_WS_X11)
+    {
+        //setXSwapInterval(on? 1 : 0);
+    }
 #endif
-*/
 }
 
 void GL_SetMultisample(dd_bool on)

diff --git a/doomsday/apps/client/src/render/vr.cpp b/doomsday/apps/client/src/render/vr.cpp
@@ -84,12 +84,12 @@ static void vrModeChanged()
 
     vrCfg().setMode(VRConfig::StereoMode(vrMode));
 
-    if(ClientWindow::mainExists())
+    if (ClientWindow::mainExists())
     {
         // The logical UI size may need to be changed.
         ClientWindow &win = ClientWindow::main();
         win.updateRootSize();
-        win.updateCanvasFormat(); // possibly changes pixel format
+        //win.updateCanvasFormat(); // possibly changes pixel format
     }
 
     /*

diff --git a/doomsday/apps/client/src/ui/clientwindow.cpp b/doomsday/apps/client/src/ui/clientwindow.cpp
@@ -628,16 +628,16 @@ DENG2_PIMPL(ClientWindow)
     {
         if (variable.name() == "fsaa")
         {
-            self.updateCanvasFormat();
+            //self.updateCanvasFormat();
         }
         else if (variable.name() == "vsync")
         {
-#ifdef WIN32
+/*#ifdef WIN32
             self.updateCanvasFormat();
             DENG2_UNUSED(newValue);
-#else
+#else*/
             GL_SetVSync(newValue.isTrue());
-#endif
+//#endif
         }
     }
 
@@ -1061,11 +1061,11 @@ void ClientWindow::hideTaskBarBlur()
     }
 }
 
-void ClientWindow::updateCanvasFormat()
+/*void ClientWindow::updateCanvasFormat()
 {
     //d->needSurfaceFormatUpdate = true;
     /// @todo Update Canvas surface format.
-}
+}*/
 
 void ClientWindow::updateRootSize()
 {