From db49a0b9d65cb66054fbbbb181d65d74b55a7acb Mon Sep 17 00:00:00 2001
From: Anna <anna@highfidelity.io>
Date: Mon, 29 Jul 2019 11:55:12 -0700
Subject: [PATCH] fixed some typos from merge

---
 .../render-utils/src/RenderForwardTask.cpp    | 25 ++++++-------------
 .../src/ToneMapAndResampleTask.cpp            |  6 ++---
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index 866c1db2a1..714291d103 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -140,29 +140,18 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend
         task.addJob<DebugZoneLighting>("DrawZoneStack", debugZoneInputs);
     }
 
-#if !defined(Q_OS_ANDROID)
-
-    // Just resolve the msaa
-    const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, static_cast<gpu::FramebufferPointer>(nullptr)).asVarying();
-    const auto resolvedFramebuffer = task.addJob<ResolveFramebuffer>("Resolve", resolveInputs);
-
-    //const auto toneMappedBuffer = resolvedFramebuffer;
-#else
     const auto newResolvedFramebuffer = task.addJob<NewFramebuffer>("MakeResolvingFramebuffer");
 
-    // Just resolve the msaa
+    #if 1
+    const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, static_cast<gpu::FramebufferPointer>(nullptr)).asVarying();
+    #else
     const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, newResolvedFramebuffer).asVarying();
+    #endif
+    
     const auto resolvedFramebuffer = task.addJob<ResolveFramebuffer>("Resolve", resolveInputs);
 
-    // Lighting Buffer ready for tone mapping
-    // Forward rendering on GLES doesn't support tonemapping to and from the same FBO, so we specify 
-    // the output FBO as null, which causes the tonemapping to target the blit framebuffer
-    //const auto toneMappingInputs = ToneMappingDeferred::Input(resolvedFramebuffer, resolvedFramebuffer).asVarying();
-    //const auto toneMappedBuffer = task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs);
-
-#endif
-
-    const auto primaryFramebuffer = task.addJob<ToneMapAndResample>("ToneMapAndResample", resolvedFramebuffer);
+    //const auto toneMappingInputs = ToneMappingDeferred::Input(resolvedFramebuffer, args->blitFramebuffer).asVarying();
+    const auto toneMappedBuffer = task.addJob<ToneMapAndResample>("ToneMapAndResample", resolvedFramebuffer);
 
     // HUD Layer
     const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(toneMappedBuffer, lightingModel, hudOpaque, hudTransparent, hazeFrame).asVarying();
diff --git a/libraries/render-utils/src/ToneMapAndResampleTask.cpp b/libraries/render-utils/src/ToneMapAndResampleTask.cpp
index 9608309ee2..adafdf0531 100644
--- a/libraries/render-utils/src/ToneMapAndResampleTask.cpp
+++ b/libraries/render-utils/src/ToneMapAndResampleTask.cpp
@@ -73,7 +73,7 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In
 
     resampledFrameBuffer = args->_blitFramebuffer;
 
-    if (!lightingBuffer || !blitFramebuffer) {
+    if (!lightingBuffer || !resampledFramebuffer) {
         return;
     }
 
@@ -105,8 +105,6 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In
         });
 
         // Set full final viewport
-        args->_viewport = viewport;
-
-        output = blitFramebuffer;
+        args->_viewport = destViewport;
     }
 }
\ No newline at end of file