From cb3456195e44d4168665d90590e33ffcdb10f7a1 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Mon, 15 Jan 2018 10:48:39 -0800
Subject: [PATCH] Fix OSX Oculus plugin
---
.../oculusLegacy/src/OculusLegacyDisplayPlugin.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
index 804ff7d62e..e6b555443f 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
@@ -9,6 +9,8 @@
#include <memory>
+#include <gl/Config.h>
+
#include <QtCore/QThread.h>
#include <QtWidgets/QMainWindow>
#include <QtOpenGL/QGLWidget>
@@ -192,14 +194,9 @@ void OculusLegacyDisplayPlugin::internalDeactivate() {
_container->makeRenderingContextCurrent();
}
-// DLL based display plugins MUST initialize GLEW inside the DLL code.
+// DLL based display plugins MUST initialize GL inside the DLL code.
void OculusLegacyDisplayPlugin::customizeContext() {
- static std::once_flag once;
- std::call_once(once, []{
- glewExperimental = true;
- glewInit();
- glGetError();
- });
+ gl::initModuleGl();
_hmdWindow->requestActivate();
QThread::msleep(1000);
Parent::customizeContext();