History

more work on batch optimzation

Brad Hefta-Gaub committed 11 years ago

Commit 85b23221 parent b2bbaf413 files · +142 −116Browse 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−4
@@ -32,7 +32,7 @@ using namespace render; · 31 unmodified lines
32 32
33void SetupDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {33void SetupDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
34 RenderArgs* args = renderContext->args;34 RenderArgs* args = renderContext->args;
35 doInBatch(args->_context, [=](gpu::Batch& batch) {35 gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
36 36
37 auto primaryFbo = DependencyManager::get<FramebufferCache>()->getPrimaryFramebufferDepthColor();37 auto primaryFbo = DependencyManager::get<FramebufferCache>()->getPrimaryFramebufferDepthColor();
38 38
@@ -166,7 +166,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend · 127 unmodified lines
166 assert(renderContext->args->_viewFrustum);166 assert(renderContext->args->_viewFrustum);
167 167
168 RenderArgs* args = renderContext->args;168 RenderArgs* args = renderContext->args;
169 doInBatch(args->_context, [=](gpu::Batch& batch) {169 gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
170 batch.setViewportTransform(args->_viewport);170 batch.setViewportTransform(args->_viewport);
171 batch.setStateScissorRect(args->_viewport);171 batch.setStateScissorRect(args->_viewport);
172 args->_batch = &batch;172 args->_batch = &batch;
@@ -195,7 +195,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const · 22 unmodified lines
195 assert(renderContext->args->_viewFrustum);195 assert(renderContext->args->_viewFrustum);
196 196
197 RenderArgs* args = renderContext->args;197 RenderArgs* args = renderContext->args;
198 doInBatch(args->_context, [=](gpu::Batch& batch) {198 gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
199 batch.setViewportTransform(args->_viewport);199 batch.setViewportTransform(args->_viewport);
200 batch.setStateScissorRect(args->_viewport);200 batch.setStateScissorRect(args->_viewport);
201 args->_batch = &batch;201 args->_batch = &batch;
@@ -267,7 +267,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 65 unmodified lines
267 }267 }
268 268
269 // Render the items269 // Render the items
270 doInBatch(args->_context, [=](gpu::Batch& batch) {270 gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
271 args->_batch = &batch;271 args->_batch = &batch;
272 args->_whiteTexture = DependencyManager::get<TextureCache>()->getWhiteTexture();272 args->_whiteTexture = DependencyManager::get<TextureCache>()->getWhiteTexture();
273 273