History

Merge branch 'master' into smarter_textures

Brad Davis committed 9 years ago

Commit 8782fe12 parents 9ae750b 5223f8748 files · +1219 −326Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+11−11
@@ -75,7 +75,6 @@ RenderDeferredTask::RenderDeferredTask(RenderFetchCullSortTask::Output items) { · 74 unmodified lines
7575 // GPU jobs: Start preparing the primary, deferred and lighting buffer
7676 const auto primaryFramebuffer = addJob<PreparePrimaryFramebuffer>("PreparePrimaryBuffer");
7777
78− // const auto fullFrameRangeTimer = addJob<BeginGPURangeTimer>("BeginRangeTimer");
7978 const auto opaqueRangeTimer = addJob<BeginGPURangeTimer>("BeginOpaqueRangeTimer", "DrawOpaques");
8079
8180 const auto prepareDeferredInputs = PrepareDeferred::Inputs(primaryFramebuffer, lightingModel).hasVarying();
@@ -154,21 +153,25 @@ RenderDeferredTask::RenderDeferredTask(RenderFetchCullSortTask::Output items) { · 72 unmodified lines
154153 const auto toneMappingInputs = render::Varying(ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer));
155154 addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs);
156155
156+ { // DEbug the bounds of the rendered items, still look at the zbuffer
157+ addJob<DrawBounds>("DrawMetaBounds", metas);
158+ addJob<DrawBounds>("DrawOpaqueBounds", opaques);
159+ addJob<DrawBounds>("DrawTransparentBounds", transparents);
160+ }
161+
157162 // Overlays
158163 const auto overlayOpaquesInputs = DrawOverlay3D::Inputs(overlayOpaques, lightingModel).hasVarying();
159164 const auto overlayTransparentsInputs = DrawOverlay3D::Inputs(overlayTransparents, lightingModel).hasVarying();
160165 addJob<DrawOverlay3D>("DrawOverlay3DOpaque", overlayOpaquesInputs, true);
161166 addJob<DrawOverlay3D>("DrawOverlay3DTransparent", overlayTransparentsInputs, false);
162167
163− // Debugging stages
164− {
165−
166−
167− // Bounds do not draw on stencil buffer, so they must come last
168− addJob<DrawBounds>("DrawMetaBounds", metas);
168+ { // DEbug the bounds of the rendered OVERLAY items, still look at the zbuffer
169169 addJob<DrawBounds>("DrawOverlayOpaqueBounds", overlayOpaques);
170170 addJob<DrawBounds>("DrawOverlayTransparentBounds", overlayTransparents);
171−
171+ }
172+
173+ // Debugging stages
174+ {
172175 // Debugging Deferred buffer job
173176 const auto debugFramebuffers = render::Varying(DebugDeferredBuffer::Inputs(deferredFramebuffer, linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionFramebuffer));
174177 addJob<DebugDeferredBuffer>("DebugDeferredBuffer", debugFramebuffers);
@@ -208,9 +211,6 @@ RenderDeferredTask::RenderDeferredTask(RenderFetchCullSortTask::Output items) { · 33 unmodified lines
208211
209212 // Blit!
210213 addJob<Blit>("Blit", primaryFramebuffer);
211−
212− // addJob<EndGPURangeTimer>("RangeTimer", fullFrameRangeTimer);
213−
214214 }
215215
216216 void BeginGPURangeTimer::run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext, gpu::RangeTimerPointer& timer) {