From 1e47a536031829dfad3a527b428447f3df96c0af Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sun, 1 Nov 2015 14:34:03 -0800 Subject: [PATCH] Fixing mac oculus crash --- plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp | 8 ++++++++ plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h | 1 + 2 files changed, 9 insertions(+) diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp index 5a253cdbbf..0120bcf2aa 100644 --- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp +++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp @@ -190,6 +190,14 @@ void OculusLegacyDisplayPlugin::deactivate() { ovr_Shutdown(); } +// DLL based display plugins MUST initialize GLEW inside the DLL code. +void OculusLegacyDisplayPlugin::customizeContext() { + glewExperimental = true; + GLenum err = glewInit(); + glGetError(); + WindowOpenGLDisplayPlugin::customizeContext(); +} + void OculusLegacyDisplayPlugin::preDisplay() { _window->makeCurrent(); } diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h index 2e95cee9bb..6e3f864aee 100644 --- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h +++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h @@ -35,6 +35,7 @@ public: virtual glm::mat4 getHeadPose() const override; protected: + virtual void customizeContext() override; virtual void preRender() override; virtual void preDisplay() override; virtual void display(GLuint finalTexture, const glm::uvec2& sceneSize) override;