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/RenderDeferredTask.cpp (1 of 13 files). Show all

Unified · Split

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