From f1fd8ac6e42263c3a9cf594b6d852ce9374f439a Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Sun, 7 Aug 2016 19:56:26 -0700 Subject: [PATCH] Fix OSX Oculus issues --- .../src/display-plugins/OpenGLDisplayPlugin.cpp | 4 +++- libraries/gpu/src/gpu/Buffer.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index d0f0d2fe8d..927c4dc0f7 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -730,7 +730,9 @@ gpu::gl::GLBackend* OpenGLDisplayPlugin::getGLBackend() { if (!_backend) { return nullptr; } - return dynamic_cast(_backend.get()); + auto backend = _backend.get(); + auto glbackend = static_cast(backend); + return glbackend; } void OpenGLDisplayPlugin::render(std::function f) { diff --git a/libraries/gpu/src/gpu/Buffer.h b/libraries/gpu/src/gpu/Buffer.h index f2d4fb4d44..44a4e879a3 100644 --- a/libraries/gpu/src/gpu/Buffer.h +++ b/libraries/gpu/src/gpu/Buffer.h @@ -130,8 +130,8 @@ public: mutable PageManager _renderPages; mutable Sysmem _renderSysmem; - mutable std::atomic _getUpdateCount; - mutable std::atomic _applyUpdateCount; + mutable std::atomic _getUpdateCount { 0 }; + mutable std::atomic _applyUpdateCount { 0 }; //protected: public: void markDirty(Size offset, Size bytes);