diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
index b8912d95b6..a35496f88e 100644
--- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
@@ -113,14 +113,8 @@ gpu::PipelinePointer Basic2DWindowOpenGLDisplayPlugin::getRenderTexturePipeline(
 #if defined(Q_OS_ANDROID)
     return _linearToSRGBPipeline;
 #else
-
-#ifndef USE_GLES
-    return _SRGBToLinearPipeline;
-#else
     return _drawTexturePipeline;
 #endif
-
-#endif
 }
 
 void Basic2DWindowOpenGLDisplayPlugin::compositeExtra() {
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 75cdf5ebef..f90dcaa599 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -642,7 +642,7 @@ void OpenGLDisplayPlugin::compositeScene() {
         batch.setStateScissorRect(ivec4(uvec2(), _compositeFramebuffer->getSize()));
         batch.resetViewTransform();
         batch.setProjectionTransform(mat4());
-        batch.setPipeline(getCompositeScenePipeline());
+        batch.setPipeline(_drawTexturePipeline);
         batch.setResourceTexture(0, _currentFrame->framebuffer->getRenderBuffer(0));
         batch.draw(gpu::TRIANGLE_STRIP, 4);
     });
@@ -964,7 +964,3 @@ gpu::PipelinePointer OpenGLDisplayPlugin::getRenderTexturePipeline() {
     return _drawTexturePipeline;
 }
 
-gpu::PipelinePointer OpenGLDisplayPlugin::getCompositeScenePipeline() {
-    return _drawTexturePipeline;
-}
-
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index 777c74822a..85ba235e7a 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -162,7 +162,6 @@ protected:
     float _compositeHUDAlpha{ 1.0f };
 
     virtual gpu::PipelinePointer getRenderTexturePipeline();
-    virtual gpu::PipelinePointer getCompositeScenePipeline();
 
     struct CursorData {
         QImage image;
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 3952c2c90e..1323f76423 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -174,6 +174,10 @@ 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 3fe53d9be1..16b84babb5 100644
--- a/libraries/render-utils/src/toneMapping.slf
+++ b/libraries/render-utils/src/toneMapping.slf
@@ -20,6 +20,7 @@ struct ToneMappingParams {
     ivec4 _toneCurve_s0_s1_s2;
 };
 
+const float GAMMA_22 = 2.2;
 const float INV_GAMMA_22 = 1.0 / 2.2;
 const int ToneCurveNone = 0;
 const int ToneCurveGamma22 = 1;
@@ -55,9 +56,17 @@ void main(void) {
     } else if (toneCurve == ToneCurveReinhard) {
         tonedColor = srcColor/(1.0 + srcColor);
         tonedColor = pow(tonedColor, vec3(INV_GAMMA_22));
-    } else if (toneCurve == ToneCurveGamma22) {
-        tonedColor = pow(srcColor, vec3(INV_GAMMA_22));
-    } // else None toned = src
+    } 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
+        // 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
+    }
 
     outFragColor = vec4(tonedColor, 1.0);
 }