From 379a262b072b84909a24dab25f83941a3da01af4 Mon Sep 17 00:00:00 2001 From: Anna Date: Mon, 29 Jul 2019 18:15:54 -0700 Subject: [PATCH] bug fix in deferred, finish merging android & windows forward --- libraries/render-utils/src/RenderDeferredTask.cpp | 4 +++- libraries/render-utils/src/RenderForwardTask.cpp | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index cffbad0e44..7f91c6eaf2 100644 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/libraries/render-utils/src/RenderDeferredTask.cpp @@ -237,8 +237,10 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren const auto bloomInputs = BloomEffect::Inputs(deferredFrameTransform, lightingFramebuffer, bloomFrame).asVarying(); task.addJob("Bloom", bloomInputs); + const auto destFramebuffer = static_cast(nullptr); + // Lighting Buffer ready for tone mapping - const auto toneMappingInputs = lightingFramebuffer; + const auto toneMappingInputs = ToneMapAndResample::Input(lightingFramebuffer, destFramebuffer).asVarying(); const auto toneMappedBuffer = task.addJob("ToneMapAndResample", toneMappingInputs); // Debugging task is happening in the "over" layer after tone mapping and just before HUD diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp index 33af6aaa71..fdcb6c6741 100755 --- a/libraries/render-utils/src/RenderForwardTask.cpp +++ b/libraries/render-utils/src/RenderForwardTask.cpp @@ -145,11 +145,7 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend const auto resolveInputs = ResolveFramebuffer::Inputs(scaledPrimaryFramebuffer, newResolvedFramebuffer).asVarying(); const auto resolvedFramebuffer = task.addJob("Resolve", resolveInputs); -#if defined(Q_OS_ANDROID) const auto destFramebuffer = static_cast(nullptr); -#else - const auto destFramebuffer = resolvedFramebuffer; -#endif const auto toneMappingInputs = ToneMapAndResample::Input(resolvedFramebuffer, destFramebuffer).asVarying(); const auto toneMappedBuffer = task.addJob("ToneMapAndResample", toneMappingInputs);