Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 1 file). Show all
Unified · Split
| @@ -74,7 +74,7 @@ namespace gr { · 73 unmodified lines | |||
| 74 | 74 | ||
| 75 | class RenderDeferredTaskDebug { | 75 | class RenderDeferredTaskDebug { |
| 76 | public: | 76 | public: |
| 77 | using ExtraBuffers = render::VaryingSet5<LinearDepthFramebufferPointer, SurfaceGeometryFramebufferPointer, AmbientOcclusionEffect::Output, SubsurfaceScatteringResourcePointer, VelocityFramebufferPointer>; | 77 | using ExtraBuffers = render::VaryingSet6<LinearDepthFramebufferPointer, SurfaceGeometryFramebufferPointer, AmbientOcclusionFramebufferPointer, gpu::BufferView, SubsurfaceScatteringResourcePointer, VelocityFramebufferPointer>; |
| 78 | using Input = render::VaryingSet9<RenderFetchCullSortTask::Output, RenderShadowTask::Output, | 78 | using Input = render::VaryingSet9<RenderFetchCullSortTask::Output, RenderShadowTask::Output, |
| 79 | AssembleLightingStageTask::Output, LightClusteringPass::Output, | 79 | AssembleLightingStageTask::Output, LightClusteringPass::Output, |
| 80 | PrepareDeferred::Outputs, ExtraBuffers, GenerateDeferredFrameTransform::Output, | 80 | PrepareDeferred::Outputs, ExtraBuffers, GenerateDeferredFrameTransform::Output, |
| @@ -256,7 +256,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 175 unmodified lines | |||
| 256 | 256 | ||
| 257 | // Debugging task is happening in the "over" layer after tone mapping and just before HUD | 257 | // Debugging task is happening in the "over" layer after tone mapping and just before HUD |
| 258 | { // Debug the bounds of the rendered items, still look at the zbuffer | 258 | { // Debug the bounds of the rendered items, still look at the zbuffer |
| 259 | const auto extraDebugBuffers = RenderDeferredTaskDebug::ExtraBuffers(linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionOutputs, scatteringResource, velocityBuffer); | 259 | const auto extraDebugBuffers = RenderDeferredTaskDebug::ExtraBuffers(linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, ambientOcclusionFramebuffer, scatteringResource, velocityBuffer); |
| 260 | const auto debugInputs = RenderDeferredTaskDebug::Input(fetchedItems, inputs.get2(), lightingStageInputs, lightClusters, prepareDeferredOutputs, extraDebugBuffers, | 260 | const auto debugInputs = RenderDeferredTaskDebug::Input(fetchedItems, inputs.get2(), lightingStageInputs, lightClusters, prepareDeferredOutputs, extraDebugBuffers, |
| 261 | deferredFrameTransform, jitter, lightingModel).asVarying(); | 261 | deferredFrameTransform, jitter, lightingModel).asVarying(); |
| 262 | task.addJob<RenderDeferredTaskDebug>("DebugRenderDeferredTask", debugInputs); | 262 | task.addJob<RenderDeferredTaskDebug>("DebugRenderDeferredTask", debugInputs); |
| @@ -331,13 +331,12 @@ void RenderDeferredTaskDebug::build(JobModel& task, const render::Varying& input · 68 unmodified lines | |||
| 331 | 331 | ||
| 332 | // extraDeferredBuffer | 332 | // extraDeferredBuffer |
| 333 | const auto& extraDeferredBuffer = inputs.get5(); | 333 | const auto& extraDeferredBuffer = inputs.get5(); |
| 334 | const auto& linearDepthTarget = extraDeferredBuffer.get0(); | 334 | const auto& linearDepthTarget = extraDeferredBuffer[0]; |
| 335 | const auto& surfaceGeometryFramebuffer = extraDeferredBuffer.get1(); | 335 | const auto& surfaceGeometryFramebuffer = extraDeferredBuffer[1]; |
| 336 | const auto& ambientOcclusionOut = extraDeferredBuffer.get2(); | 336 | const auto& ambientOcclusionFramebuffer = extraDeferredBuffer[2]; |
| 337 | const auto& ambientOcclusionFramebuffer = ambientOcclusionOut[0]; | 337 | const auto& ambientOcclusionUniforms = extraDeferredBuffer[3]; |
| 338 | const auto& ambientOcclusionUniforms = ambientOcclusionOut[1]; | 338 | const auto& scatteringResource = extraDeferredBuffer[4]; |
| 339 | const auto& scatteringResource = extraDeferredBuffer[3]; | 339 | const auto& velocityBuffer = extraDeferredBuffer[5]; |
| 340 | const auto& velocityBuffer = extraDeferredBuffer[4]; | ||
| 341 | 340 | ||
| 342 | // GenerateDeferredFrameTransform out | 341 | // GenerateDeferredFrameTransform out |
| 343 | const auto& deferredFrameTransform = inputs[6]; | 342 | const auto& deferredFrameTransform = inputs[6]; |