From 0bfe3ea817ef96159d125c6cca45f53729030b2c Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Mon, 27 Jun 2016 11:34:44 -0700
Subject: [PATCH] added support for disabling vsync on macs, but doesn't work
 with the rift

---
 .../display-plugins/OpenGLDisplayPlugin.cpp    | 18 ++++++++++++++++--
 .../display-plugins/hmd/HmdDisplayPlugin.cpp   |  3 +++
 libraries/gl/src/gl/Config.h                   |  1 +
 libraries/gl/src/gl/GLWidget.cpp               | 11 +++++++----
 .../src/OculusLegacyDisplayPlugin.cpp          |  1 +
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 4bca48aeb0..eb10d4ed5e 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -16,6 +16,9 @@
 #include <QtOpenGL/QGLWidget>
 #include <QtGui/QImage>
 
+#if defined(Q_OS_MAC)
+#include <OpenGL/CGLCurrent.h>
+#endif
 #include <gl/QOpenGLContextWrapper.h>
 #include <gpu/Texture.h>
 #include <gl/GLWidget.h>
@@ -597,8 +600,14 @@ void OpenGLDisplayPlugin::enableVsync(bool enable) {
     if (!_vsyncSupported) {
         return;
     }
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
     wglSwapIntervalEXT(enable ? 1 : 0);
+#elif defined(Q_OS_MAC)
+    GLint interval = enable ? 1 : 0;
+    CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &interval);
+#else
+    // TODO: Fill in for linux
+    return;
 #endif
 }
 
@@ -606,9 +615,14 @@ bool OpenGLDisplayPlugin::isVsyncEnabled() {
     if (!_vsyncSupported) {
         return true;
     }
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
     return wglGetSwapIntervalEXT() != 0;
+#elif defined(Q_OS_MAC)
+    GLint interval;
+    CGLGetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &interval);
+    return interval != 0;
 #else
+    // TODO: Fill in for linux
     return true;
 #endif
 }
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index b29348f646..41af4ed543 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -200,7 +200,10 @@ static ProgramPtr getReprojectionProgram() {
 void HmdDisplayPlugin::customizeContext() {
     Parent::customizeContext();
     // Only enable mirroring if we know vsync is disabled
+    // On Mac, this won't work due to how the contexts are handled, so don't try
+#if !defined(Q_OS_MAC)
     enableVsync(false);
+#endif
     _enablePreview = !isVsyncEnabled();
     _sphereSection = loadSphereSection(_program, CompositorHelper::VIRTUAL_UI_TARGET_FOV.y, CompositorHelper::VIRTUAL_UI_ASPECT_RATIO);
     compileProgram(_reprojectionProgram, REPROJECTION_VS, REPROJECTION_FS);
diff --git a/libraries/gl/src/gl/Config.h b/libraries/gl/src/gl/Config.h
index 593537a291..7947bd45df 100644
--- a/libraries/gl/src/gl/Config.h
+++ b/libraries/gl/src/gl/Config.h
@@ -20,6 +20,7 @@
 
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
+#include <OpenGL/OpenGL.h>
 
 #endif
 
diff --git a/libraries/gl/src/gl/GLWidget.cpp b/libraries/gl/src/gl/GLWidget.cpp
index f113be1cfb..6fc9c41160 100644
--- a/libraries/gl/src/gl/GLWidget.cpp
+++ b/libraries/gl/src/gl/GLWidget.cpp
@@ -47,13 +47,16 @@ void GLWidget::initializeGL() {
     // Note, we *DO NOT* want Qt to automatically swap buffers for us.  This results in the "ringing" bug mentioned in WL#19514 when we're throttling the framerate.
     setAutoBufferSwap(false);
 
-    // TODO: write the proper code for linux
     makeCurrent();
-#if defined(Q_OS_WIN)
     if (isValid() && context() && context()->contextHandle()) {
-        _vsyncSupported = context()->contextHandle()->hasExtension("WGL_EXT_swap_control");;
-    }
+#if defined(Q_OS_WIN)
+        _vsyncSupported = context()->contextHandle()->hasExtension("WGL_EXT_swap_control");
+#elif defined(Q_OS_MAC)
+        _vsyncSupported = true;
+#else
+        // TODO: write the proper code for linux
 #endif
+    }
 }
 
 void GLWidget::paintEvent(QPaintEvent* event) {
diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
index a994198957..e439b3fabf 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
@@ -73,6 +73,7 @@ bool OculusLegacyDisplayPlugin::isSupported() const {
     //  - resolution and one component of position match
     //  - resolution matches
     //  - position matches
+    // If it still picks the wrong screen, you'll have to mess with your monitor configuration
     QList<int> matches({ -1, -1, -1, -1 });
     if (hmd) {
         QPoint targetPosition{ hmd->WindowsPos.x, hmd->WindowsPos.y };