Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 13 files). Show all
Unified · Split
| @@ -15,7 +15,6 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <RenderArgs.h> |
| 16 | 16 | #include <ViewFrustum.h> |
| 17 | 17 | #include <gpu/Context.h> |
| 18 | −#include <gpu/DoInBatch.h> | |
| 19 | 18 | |
| 20 | 19 | #include "FramebufferCache.h" |
| 21 | 20 | #include "DeferredLightingEffect.h" |
| @@ -33,7 +32,7 @@ using namespace render; · 11 unmodified lines | ||
| 33 | 32 | |
| 34 | 33 | void SetupDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) { |
| 35 | 34 | RenderArgs* args = renderContext->args; |
| 36 | − doInBatch(args, [=](gpu::Batch& batch) { | |
| 35 | + doInBatch(args->_context, [=](gpu::Batch& batch) { | |
| 37 | 36 | |
| 38 | 37 | auto primaryFbo = DependencyManager::get<FramebufferCache>()->getPrimaryFramebufferDepthColor(); |
| 39 | 38 | |
| @@ -167,7 +166,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend · 127 unmodified lines | ||
| 167 | 166 | assert(renderContext->args->_viewFrustum); |
| 168 | 167 | |
| 169 | 168 | RenderArgs* args = renderContext->args; |
| 170 | − doInBatch(args, [=](gpu::Batch& batch) { | |
| 169 | + doInBatch(args->_context, [=](gpu::Batch& batch) { | |
| 171 | 170 | batch.setViewportTransform(args->_viewport); |
| 172 | 171 | batch.setStateScissorRect(args->_viewport); |
| 173 | 172 | args->_batch = &batch; |
| @@ -196,7 +195,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const · 22 unmodified lines | ||
| 196 | 195 | assert(renderContext->args->_viewFrustum); |
| 197 | 196 | |
| 198 | 197 | RenderArgs* args = renderContext->args; |
| 199 | − doInBatch(args, [=](gpu::Batch& batch) { | |
| 198 | + doInBatch(args->_context, [=](gpu::Batch& batch) { | |
| 200 | 199 | batch.setViewportTransform(args->_viewport); |
| 201 | 200 | batch.setStateScissorRect(args->_viewport); |
| 202 | 201 | args->_batch = &batch; |
| @@ -268,7 +267,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 65 unmodified lines | ||
| 268 | 267 | } |
| 269 | 268 | |
| 270 | 269 | // Render the items |
| 271 | − doInBatch(args, [=](gpu::Batch& batch) { | |
| 270 | + doInBatch(args->_context, [=](gpu::Batch& batch) { | |
| 272 | 271 | args->_batch = &batch; |
| 273 | 272 | args->_whiteTexture = DependencyManager::get<TextureCache>()->getWhiteTexture(); |
| 274 | 273 | |