History

address Sam's concerns

Brad Hefta-Gaub committed 11 years ago

Commit 9a0e5b91 parent 62c1e4013 files · +29 −68Browse files

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

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+3−4
@@ -17,7 +17,6 @@ · 16 unmodified lines
1717
1818 #include <gpu/Batch.h>
1919 #include <gpu/Context.h>
20−#include <gpu/DoInBatch.h>
2120 #include <gpu/StandardShaderLib.h>
2221
2322 #include "AbstractViewStateInterface.h"
@@ -341,7 +340,7 @@ void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radiu · 317 unmodified lines
341340 }
342341
343342 void DeferredLightingEffect::prepare(RenderArgs* args) {
344− doInBatch(args, [=](gpu::Batch& batch) {
343+ doInBatch(args->_context, [=](gpu::Batch& batch) {
345344 batch.enableStereo(false);
346345 batch.setStateScissorRect(args->_viewport);
347346
@@ -358,7 +357,7 @@ void DeferredLightingEffect::prepare(RenderArgs* args) { · 10 unmodified lines
358357 gpu::FramebufferPointer _copyFBO;
359358
360359 void DeferredLightingEffect::render(RenderArgs* args) {
361− doInBatch(args, [=](gpu::Batch& batch) {
360+ doInBatch(args->_context, [=](gpu::Batch& batch) {
362361
363362 // Allocate the parameters buffer used by all the deferred shaders
364363 if (!_deferredTransformBuffer[0]._buffer) {
@@ -686,7 +685,7 @@ void DeferredLightingEffect::render(RenderArgs* args) { · 321 unmodified lines
686685
687686 void DeferredLightingEffect::copyBack(RenderArgs* args) {
688687 auto framebufferCache = DependencyManager::get<FramebufferCache>();
689− doInBatch(args, [=](gpu::Batch& batch) {
688+ doInBatch(args->_context, [=](gpu::Batch& batch) {
690689 batch.enableStereo(false);
691690 QSize framebufferSize = framebufferCache->getFrameBufferSize();
692691

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