History

Merge branch 'master' into stages

HifiExperiments committed 2 years ago

Commit bdf35682 parents ac3730c c660c22111 files · +543 −4079Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 111 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+5−4
@@ -102,12 +102,11 @@ void RenderDeferredTask::configure(const Config& config) { · 101 unmodified lines
102}102}
103 103
104void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, size_t depth) {104void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, size_t depth) {
105 static auto fadeEffect = DependencyManager::get<FadeEffect>();
106 // Prepare the ShapePipelines105 // Prepare the ShapePipelines
107 static ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();106 static ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();
108 static std::once_flag once;107 static std::once_flag once;
109 std::call_once(once, [] {108 std::call_once(once, [] {
110 initDeferredPipelines(*shapePlumber, fadeEffect->getBatchSetter(), fadeEffect->getItemUniformSetter());109 initDeferredPipelines(*shapePlumber, FadeEffect::getBatchSetter(), FadeEffect::getItemUniformSetter());
111 });110 });
112 111
113 const auto& inputs = input.get<Input>();112 const auto& inputs = input.get<Input>();
@@ -147,7 +146,9 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 33 unmodified lines
147 // Shadow Stage Frame146 // Shadow Stage Frame
148 const auto shadowFrame = shadowTaskOutputs[1];147 const auto shadowFrame = shadowTaskOutputs[1];
149 148
150 fadeEffect->build(task, opaques);149 if (depth == 0) {
150 task.addJob<FadeEffect>("FadeEffect", opaques);
151 }
151 152
152 const auto jitter = task.addJob<JitterSample>("JitterCam");153 const auto jitter = task.addJob<JitterSample>("JitterCam");
153 154
@@ -257,7 +258,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 103 unmodified lines
257 const auto toneMappedBuffer = task.addJob<ToneMapAndResample>("ToneMapping", toneMappingInputs);258 const auto toneMappedBuffer = task.addJob<ToneMapAndResample>("ToneMapping", toneMappingInputs);
258 259
259 // Debugging task is happening in the "over" layer after tone mapping and just before HUD260 // Debugging task is happening in the "over" layer after tone mapping and just before HUD
260 { // Debug the bounds of the rendered items, still look at the zbuffer261 if (depth == 0) { // Debug the bounds of the rendered items, still look at the zbuffer
261 const auto extraDebugBuffers = RenderDeferredTaskDebug::ExtraBuffers(linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, ambientOcclusionUniforms, scatteringResource, velocityBuffer);262 const auto extraDebugBuffers = RenderDeferredTaskDebug::ExtraBuffers(linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, ambientOcclusionUniforms, scatteringResource, velocityBuffer);
262 const auto debugInputs = RenderDeferredTaskDebug::Input(fetchedItems, shadowTaskOutputs, lightingStageInputs, lightClusters, prepareDeferredOutputs, extraDebugBuffers,263 const auto debugInputs = RenderDeferredTaskDebug::Input(fetchedItems, shadowTaskOutputs, lightingStageInputs, lightClusters, prepareDeferredOutputs, extraDebugBuffers,
263 deferredFrameTransform, jitter, lightingModel).asVarying();264 deferredFrameTransform, jitter, lightingModel).asVarying();