From 8c3ddc049ce33c596a1fd1f8f519e9a50ae327b6 Mon Sep 17 00:00:00 2001
From: Anna <anna@highfidelity.io>
Date: Fri, 21 Jun 2019 20:08:09 -0700
Subject: [PATCH] works on desktop, android mobile, rift and quest

---
 .../Basic2DWindowOpenGLDisplayPlugin.cpp        | 17 -----------------
 .../Basic2DWindowOpenGLDisplayPlugin.h          |  2 --
 .../src/display-plugins/OpenGLDisplayPlugin.cpp |  8 +-------
 .../src/display-plugins/OpenGLDisplayPlugin.h   |  1 -
 plugins/oculus/src/OculusDisplayPlugin.cpp      |  5 +++++
 plugins/oculus/src/OculusDisplayPlugin.h        |  1 +
 6 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
index 38f7600315..b8912d95b6 100644
--- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
@@ -123,23 +123,6 @@ gpu::PipelinePointer Basic2DWindowOpenGLDisplayPlugin::getRenderTexturePipeline(
 #endif
 }
 
-gpu::PipelinePointer Basic2DWindowOpenGLDisplayPlugin::getCompositeScenePipeline() {
-#if defined(Q_OS_ANDROID)
-    return _linearToSRGBPipeline;
-#else
-    return _drawTexturePipeline;
-#endif
-}
-
-gpu::Element Basic2DWindowOpenGLDisplayPlugin::getCompositeFBColorSpace() {
-#if defined(Q_OS_ANDROID)
-    return gpu::Element::COLOR_SRGBA_32;
-#else
-    return gpu::Element::COLOR_RGBA_32;
-#endif
-}
-
-
 void Basic2DWindowOpenGLDisplayPlugin::compositeExtra() {
 #if defined(Q_OS_ANDROID)
     auto& virtualPadManager = VirtualPad::Manager::instance();
diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
index ae830b2e28..68301ff8b4 100644
--- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
@@ -38,8 +38,6 @@ public:
     virtual void pluginUpdate() override {};
 
     virtual gpu::PipelinePointer getRenderTexturePipeline() override;
-    virtual gpu::PipelinePointer getCompositeScenePipeline() override;
-    virtual gpu::Element getCompositeFBColorSpace() override;
 
 protected:
     mutable bool _isThrottled = false;
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 7d12825b7e..75cdf5ebef 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -905,7 +905,7 @@ OpenGLDisplayPlugin::~OpenGLDisplayPlugin() {
 void OpenGLDisplayPlugin::updateCompositeFramebuffer() {
     auto renderSize = glm::uvec2(getRecommendedRenderSize());
     if (!_compositeFramebuffer || _compositeFramebuffer->getSize() != renderSize) {
-        _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("OpenGLDisplayPlugin::composite", getCompositeFBColorSpace(), renderSize.x, renderSize.y));
+        _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("OpenGLDisplayPlugin::composite", gpu::Element::COLOR_RGBA_32, renderSize.x, renderSize.y));
     }
 }
 
@@ -968,9 +968,3 @@ gpu::PipelinePointer OpenGLDisplayPlugin::getCompositeScenePipeline() {
     return _drawTexturePipeline;
 }
 
-// Added this to allow desktop composite framebuffer to be RGBA while mobile is SRGBA, so that tone mapping looks right on both platforms
-// Overridden by Basic2DWindowDisplayPlugin to achieve this
-// FIXME: Eventually it would be ideal to have both framebuffers be of the same type
-gpu::Element OpenGLDisplayPlugin::getCompositeFBColorSpace() {
-    return gpu::Element::COLOR_RGBA_32;
-}
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index d5d9bad8a6..a6ab40d2bc 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -163,7 +163,6 @@ protected:
 
     virtual gpu::PipelinePointer getRenderTexturePipeline();
     virtual gpu::PipelinePointer getCompositeScenePipeline();
-    virtual gpu::Element getCompositeFBColorSpace();
 
     struct CursorData {
         QImage image;
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index c493588992..f928ccb8a4 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -124,6 +124,11 @@ void OculusDisplayPlugin::uncustomizeContext() {
     Parent::uncustomizeContext();
 }
 
+gpu::PipelinePointer OculusDisplayPlugin::getRenderTexturePipeline() {
+    //return _SRGBToLinearPipeline;
+    return _drawTexturePipeline;
+}
+
 gpu::PipelinePointer OculusDisplayPlugin::getCompositeScenePipeline() {
     return _SRGBToLinearPipeline;
 }
diff --git a/plugins/oculus/src/OculusDisplayPlugin.h b/plugins/oculus/src/OculusDisplayPlugin.h
index b220ee0214..a892d27534 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.h
+++ b/plugins/oculus/src/OculusDisplayPlugin.h
@@ -24,6 +24,7 @@ public:
 
     virtual QJsonObject getHardwareStats() const;
 
+    virtual gpu::PipelinePointer getRenderTexturePipeline() override;
     virtual gpu::PipelinePointer getCompositeScenePipeline() override;
 
 protected: