Showing the changes to libraries/render-utils/src/DeferredLightingEffect.cpp (1 of 13 files). Show all
Unified · Split
| @@ -17,7 +17,6 @@ · 16 unmodified lines | |||
| 17 | 17 | ||
| 18 | #include <gpu/Batch.h> | 18 | #include <gpu/Batch.h> |
| 19 | #include <gpu/Context.h> | 19 | #include <gpu/Context.h> |
| 20 | #include <gpu/DoInBatch.h> | ||
| 21 | #include <gpu/StandardShaderLib.h> | 20 | #include <gpu/StandardShaderLib.h> |
| 22 | 21 | ||
| 23 | #include "AbstractViewStateInterface.h" | 22 | #include "AbstractViewStateInterface.h" |
| @@ -341,7 +340,7 @@ void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radiu · 317 unmodified lines | |||
| 341 | } | 340 | } |
| 342 | 341 | ||
| 343 | void DeferredLightingEffect::prepare(RenderArgs* args) { | 342 | void DeferredLightingEffect::prepare(RenderArgs* args) { |
| 344 | doInBatch(args, [=](gpu::Batch& batch) { | 343 | doInBatch(args->_context, [=](gpu::Batch& batch) { |
| 345 | batch.enableStereo(false); | 344 | batch.enableStereo(false); |
| 346 | batch.setStateScissorRect(args->_viewport); | 345 | batch.setStateScissorRect(args->_viewport); |
| 347 | 346 | ||
| @@ -358,7 +357,7 @@ void DeferredLightingEffect::prepare(RenderArgs* args) { · 10 unmodified lines | |||
| 358 | gpu::FramebufferPointer _copyFBO; | 357 | gpu::FramebufferPointer _copyFBO; |
| 359 | 358 | ||
| 360 | void DeferredLightingEffect::render(RenderArgs* args) { | 359 | void DeferredLightingEffect::render(RenderArgs* args) { |
| 361 | doInBatch(args, [=](gpu::Batch& batch) { | 360 | doInBatch(args->_context, [=](gpu::Batch& batch) { |
| 362 | 361 | ||
| 363 | // Allocate the parameters buffer used by all the deferred shaders | 362 | // Allocate the parameters buffer used by all the deferred shaders |
| 364 | if (!_deferredTransformBuffer[0]._buffer) { | 363 | if (!_deferredTransformBuffer[0]._buffer) { |
| @@ -686,7 +685,7 @@ void DeferredLightingEffect::render(RenderArgs* args) { · 321 unmodified lines | |||
| 686 | 685 | ||
| 687 | void DeferredLightingEffect::copyBack(RenderArgs* args) { | 686 | void DeferredLightingEffect::copyBack(RenderArgs* args) { |
| 688 | auto framebufferCache = DependencyManager::get<FramebufferCache>(); | 687 | auto framebufferCache = DependencyManager::get<FramebufferCache>(); |
| 689 | doInBatch(args, [=](gpu::Batch& batch) { | 688 | doInBatch(args->_context, [=](gpu::Batch& batch) { |
| 690 | batch.enableStereo(false); | 689 | batch.enableStereo(false); |
| 691 | QSize framebufferSize = framebufferCache->getFrameBufferSize(); | 690 | QSize framebufferSize = framebufferCache->getFrameBufferSize(); |
| 692 | 691 | ||