History

Merge remote-tracking branch 'upstream/master' into HEAD

Bradley Austin Davis committed 9 years ago

Commit efad7da2 parents fa5b315 ac16d8627 files · +849 −225Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+2−1
@@ -160,13 +160,14 @@ RenderDeferredTask::RenderDeferredTask(RenderFetchCullSortTask::Output items) { · 159 unmodified lines
160 addJob<DrawOverlay3D>("DrawOverlay3DOpaque", overlayOpaquesInputs, true);160 addJob<DrawOverlay3D>("DrawOverlay3DOpaque", overlayOpaquesInputs, true);
161 addJob<DrawOverlay3D>("DrawOverlay3DTransparent", overlayTransparentsInputs, false);161 addJob<DrawOverlay3D>("DrawOverlay3DTransparent", overlayTransparentsInputs, false);
162 162
163
164 // Debugging stages163 // Debugging stages
165 {164 {
166 165
167 166
168 // Bounds do not draw on stencil buffer, so they must come last167 // Bounds do not draw on stencil buffer, so they must come last
169 addJob<DrawBounds>("DrawMetaBounds", metas);168 addJob<DrawBounds>("DrawMetaBounds", metas);
169 addJob<DrawBounds>("DrawOverlayOpaqueBounds", overlayOpaques);
170 addJob<DrawBounds>("DrawOverlayTransparentBounds", overlayTransparents);
170 171
171 // Debugging Deferred buffer job172 // Debugging Deferred buffer job
172 const auto debugFramebuffers = render::Varying(DebugDeferredBuffer::Inputs(deferredFramebuffer, linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionFramebuffer));173 const auto debugFramebuffers = render::Varying(DebugDeferredBuffer::Inputs(deferredFramebuffer, linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionFramebuffer));