From 24b6d64e344e891f0e3abd41af6b6dc4176f608c Mon Sep 17 00:00:00 2001
From: Anna <anna@highfidelity.io>
Date: Wed, 26 Jun 2019 17:27:53 -0700
Subject: [PATCH] removed extraneous code for hmd

---
 .../src/display-plugins/OpenGLDisplayPlugin.cpp  |  2 +-
 .../src/display-plugins/hmd/HmdDisplayPlugin.cpp |  4 ----
 libraries/render-utils/src/toneMapping.slf       | 16 +++++++++-------
 plugins/oculus/src/OculusDisplayPlugin.cpp       |  9 ---------
 plugins/oculus/src/OculusDisplayPlugin.h         |  3 ---
 5 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index f90dcaa599..7ae24a9238 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", gpu::Element::COLOR_RGBA_32, renderSize.x, renderSize.y));
+        _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("OpenGLDisplayPlugin::composite", gpu::Element::COLOR_SRGBA_32, renderSize.x, renderSize.y));
     }
 }
 
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 1323f76423..3952c2c90e 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -174,10 +174,6 @@ float HmdDisplayPlugin::getLeftCenterPixel() const {
     return leftCenterPixel;
 }
 
-gpu::PipelinePointer HmdDisplayPlugin::getRenderTexturePipeline() {
-    return _drawTexturePipeline;
-}
-
 void HmdDisplayPlugin::internalPresent() {
     PROFILE_RANGE_EX(render, __FUNCTION__, 0xff00ff00, (uint64_t)presentCount())
 
diff --git a/libraries/render-utils/src/toneMapping.slf b/libraries/render-utils/src/toneMapping.slf
index 16b84babb5..cbdcfd26bb 100644
--- a/libraries/render-utils/src/toneMapping.slf
+++ b/libraries/render-utils/src/toneMapping.slf
@@ -56,17 +56,19 @@ void main(void) {
     } else if (toneCurve == ToneCurveReinhard) {
         tonedColor = srcColor/(1.0 + srcColor);
         tonedColor = pow(tonedColor, vec3(INV_GAMMA_22));
-    } else if (toneCurve == ToneCurveNone) {
-        // For debugging purposes, we may want to see what the colors look like before the automatic OpenGL 
-        // conversion mentioned above, so we undo it here
-        tonedColor = pow(srcColor, vec3(GAMMA_22));
-    } else {
-        // toneCurve == ToneCurveGamma22
+    } 
+    else if (toneCurve == ToneCurveGamma22) {
         // We use glEnable(GL_FRAMEBUFFER_SRGB), which automatically converts textures from RGB to SRGB
         // when writing from an RGB framebuffer to an SRGB framebuffer (note that it doesn't do anything
         // when writing from an SRGB framebuffer to an RGB framebuffer).
         // Since the conversion happens automatically, we don't need to do anything in this shader
-    }
+    } 
+    else {
+        // toneCurve == ToneCurveNone
+        // For debugging purposes, we may want to see what the colors look like before the automatic OpenGL 
+        // conversion mentioned above, so we undo it here
+        tonedColor = pow(srcColor, vec3(GAMMA_22));
+    } 
 
     outFragColor = vec4(tonedColor, 1.0);
 }
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index f928ccb8a4..bd0c77ae57 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -124,15 +124,6 @@ void OculusDisplayPlugin::uncustomizeContext() {
     Parent::uncustomizeContext();
 }
 
-gpu::PipelinePointer OculusDisplayPlugin::getRenderTexturePipeline() {
-    //return _SRGBToLinearPipeline;
-    return _drawTexturePipeline;
-}
-
-gpu::PipelinePointer OculusDisplayPlugin::getCompositeScenePipeline() {
-    return _SRGBToLinearPipeline;
-}
-
 static const uint64_t FRAME_BUDGET = (11 * USECS_PER_MSEC);
 static const uint64_t FRAME_OVER_BUDGET = (15 * USECS_PER_MSEC);
 
diff --git a/plugins/oculus/src/OculusDisplayPlugin.h b/plugins/oculus/src/OculusDisplayPlugin.h
index a892d27534..9209fd373e 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.h
+++ b/plugins/oculus/src/OculusDisplayPlugin.h
@@ -24,9 +24,6 @@ public:
 
     virtual QJsonObject getHardwareStats() const;
 
-    virtual gpu::PipelinePointer getRenderTexturePipeline() override;
-    virtual gpu::PipelinePointer getCompositeScenePipeline() override;
-
 protected:
     QThread::Priority getPresentPriority() override { return QThread::TimeCriticalPriority; }