History

Merge pull request #11157 from SamGondelman/tabletLayer

Render non-AA overlays correctly

Chris Collins committed 9 years ago

Commit 24561262 parents 3406647 ee74f6410 files · +38 −110Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+3−12
@@ -76,10 +76,6 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 75 unmodified lines
7676
7777 fadeEffect->build(task, opaques);
7878
79− // Filter the non antialiaased overlays
80− const int LAYER_NO_AA = 3;
81− const auto nonAAOverlays = task.addJob<FilterLayeredItems>("Filter2DWebOverlays", overlayOpaques, LAYER_NO_AA);
82−
8379 // Prepare deferred, generate the shared Deferred Frame Transform
8480 const auto deferredFrameTransform = task.addJob<GenerateDeferredFrameTransform>("DeferredFrameTransform");
8581 const auto lightingModel = task.addJob<MakeLightingModel>("LightingModel");
@@ -166,7 +162,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 80 unmodified lines
166162 const auto toneMappingInputs = render::Varying(ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer));
167163 task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs);
168164
169− { // DEbug the bounds of the rendered items, still look at the zbuffer
165+ { // Debug the bounds of the rendered items, still look at the zbuffer
170166 task.addJob<DrawBounds>("DrawMetaBounds", metas);
171167 task.addJob<DrawBounds>("DrawOpaqueBounds", opaques);
172168 task.addJob<DrawBounds>("DrawTransparentBounds", transparents);
@@ -181,11 +177,11 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 8 unmodified lines
181177 task.addJob<DrawOverlay3D>("DrawOverlay3DOpaque", overlayOpaquesInputs, true);
182178 task.addJob<DrawOverlay3D>("DrawOverlay3DTransparent", overlayTransparentsInputs, false);
183179
184− { // DEbug the bounds of the rendered OVERLAY items, still look at the zbuffer
180+ { // Debug the bounds of the rendered Overlay items, still look at the zbuffer
185181 task.addJob<DrawBounds>("DrawOverlayOpaqueBounds", overlayOpaques);
186182 task.addJob<DrawBounds>("DrawOverlayTransparentBounds", overlayTransparents);
187183 }
188−
184+
189185 // Debugging stages
190186 {
191187 // Debugging Deferred buffer job
@@ -216,14 +212,9 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 24 unmodified lines
216212 task.addJob<DebugZoneLighting>("DrawZoneStack", deferredFrameTransform);
217213 }
218214
219−
220215 // AA job to be revisited
221216 task.addJob<Antialiasing>("Antialiasing", primaryFramebuffer);
222217
223− // Draw 2DWeb non AA
224− const auto nonAAOverlaysInputs = DrawOverlay3D::Inputs(nonAAOverlays, lightingModel).asVarying();
225− task.addJob<DrawOverlay3D>("Draw2DWebSurfaces", nonAAOverlaysInputs, false);
226−
227218 task.addJob<EndGPURangeTimer>("ToneAndPostRangeTimer", toneAndPostRangeTimer);
228219
229220 // Blit!

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t