From 5680d58a191c0a3e4a9455e4160133a931f9e543 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 9 Jun 2015 03:09:10 -0700 Subject: [PATCH] Removing oglplus requirement for linux and mac --- interface/src/devices/OculusManager.cpp | 5 ----- libraries/shared/src/OglplusHelpers.h | 9 ++++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp index 64f12969a0..1fd84bb921 100644 --- a/interface/src/devices/OculusManager.cpp +++ b/interface/src/devices/OculusManager.cpp @@ -177,7 +177,6 @@ ovrLayerEyeFov OculusManager::_sceneLayer; #else -BasicFramebufferWrapper* _transferFbo; ovrTexture OculusManager::_eyeTextures[ovrEye_Count]; GlWindow* OculusManager::_outputWindow{ nullptr }; @@ -310,10 +309,6 @@ void OculusManager::connect(QOpenGLContext* shareContext) { } _outputWindow->showFullScreen(); _outputWindow->makeCurrent(); - _transferFbo = new BasicFramebufferWrapper(); - _transferFbo->Init(toGlm(_renderTargetSize)); - - ovrGLConfig cfg; memset(&cfg, 0, sizeof(cfg)); diff --git a/libraries/shared/src/OglplusHelpers.h b/libraries/shared/src/OglplusHelpers.h index 1a00c021f9..47e7331ce0 100644 --- a/libraries/shared/src/OglplusHelpers.h +++ b/libraries/shared/src/OglplusHelpers.h @@ -7,6 +7,12 @@ // #pragma once +// FIXME support oglplus on all platforms +// For now it's a convenient helper for Windows + +#include + +#ifdef Q_OS_WIN #include "GLMHelpers.h" #define OGLPLUS_USE_GLCOREARB_H 0 @@ -163,4 +169,5 @@ protected: } }; -using BasicFramebufferWrapperPtr = std::shared_ptr; \ No newline at end of file +using BasicFramebufferWrapperPtr = std::shared_ptr; +#endif