Render non-AA overlays correctly
Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 10 files). Show all
Unified · Split
| @@ -76,10 +76,6 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 75 unmodified lines | |||
| 76 | 76 | ||
| 77 | fadeEffect->build(task, opaques); | 77 | fadeEffect->build(task, opaques); |
| 78 | 78 | ||
| 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 | |||
| 83 | // Prepare deferred, generate the shared Deferred Frame Transform | 79 | // Prepare deferred, generate the shared Deferred Frame Transform |
| 84 | const auto deferredFrameTransform = task.addJob<GenerateDeferredFrameTransform>("DeferredFrameTransform"); | 80 | const auto deferredFrameTransform = task.addJob<GenerateDeferredFrameTransform>("DeferredFrameTransform"); |
| 85 | const auto lightingModel = task.addJob<MakeLightingModel>("LightingModel"); | 81 | const auto lightingModel = task.addJob<MakeLightingModel>("LightingModel"); |
| @@ -166,7 +162,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 80 unmodified lines | |||
| 166 | const auto toneMappingInputs = render::Varying(ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer)); | 162 | const auto toneMappingInputs = render::Varying(ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer)); |
| 167 | task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs); | 163 | task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs); |
| 168 | 164 | ||
| 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 |
| 170 | task.addJob<DrawBounds>("DrawMetaBounds", metas); | 166 | task.addJob<DrawBounds>("DrawMetaBounds", metas); |
| 171 | task.addJob<DrawBounds>("DrawOpaqueBounds", opaques); | 167 | task.addJob<DrawBounds>("DrawOpaqueBounds", opaques); |
| 172 | task.addJob<DrawBounds>("DrawTransparentBounds", transparents); | 168 | task.addJob<DrawBounds>("DrawTransparentBounds", transparents); |
| @@ -181,11 +177,11 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 8 unmodified lines | |||
| 181 | task.addJob<DrawOverlay3D>("DrawOverlay3DOpaque", overlayOpaquesInputs, true); | 177 | task.addJob<DrawOverlay3D>("DrawOverlay3DOpaque", overlayOpaquesInputs, true); |
| 182 | task.addJob<DrawOverlay3D>("DrawOverlay3DTransparent", overlayTransparentsInputs, false); | 178 | task.addJob<DrawOverlay3D>("DrawOverlay3DTransparent", overlayTransparentsInputs, false); |
| 183 | 179 | ||
| 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 |
| 185 | task.addJob<DrawBounds>("DrawOverlayOpaqueBounds", overlayOpaques); | 181 | task.addJob<DrawBounds>("DrawOverlayOpaqueBounds", overlayOpaques); |
| 186 | task.addJob<DrawBounds>("DrawOverlayTransparentBounds", overlayTransparents); | 182 | task.addJob<DrawBounds>("DrawOverlayTransparentBounds", overlayTransparents); |
| 187 | } | 183 | } |
| 188 | 184 | ||
| 189 | // Debugging stages | 185 | // Debugging stages |
| 190 | { | 186 | { |
| 191 | // Debugging Deferred buffer job | 187 | // Debugging Deferred buffer job |
| @@ -216,14 +212,9 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 24 unmodified lines | |||
| 216 | task.addJob<DebugZoneLighting>("DrawZoneStack", deferredFrameTransform); | 212 | task.addJob<DebugZoneLighting>("DrawZoneStack", deferredFrameTransform); |
| 217 | } | 213 | } |
| 218 | 214 | ||
| 219 | |||
| 220 | // AA job to be revisited | 215 | // AA job to be revisited |
| 221 | task.addJob<Antialiasing>("Antialiasing", primaryFramebuffer); | 216 | task.addJob<Antialiasing>("Antialiasing", primaryFramebuffer); |
| 222 | 217 | ||
| 223 | // Draw 2DWeb non AA | ||
| 224 | const auto nonAAOverlaysInputs = DrawOverlay3D::Inputs(nonAAOverlays, lightingModel).asVarying(); | ||
| 225 | task.addJob<DrawOverlay3D>("Draw2DWebSurfaces", nonAAOverlaysInputs, false); | ||
| 226 | |||
| 227 | task.addJob<EndGPURangeTimer>("ToneAndPostRangeTimer", toneAndPostRangeTimer); | 218 | task.addJob<EndGPURangeTimer>("ToneAndPostRangeTimer", toneAndPostRangeTimer); |
| 228 | 219 | ||
| 229 | // Blit! | 220 | // Blit! |