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
3232
3333 void SetupDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
3434 RenderArgs* args = renderContext->args;
35− doInBatch(args->_context, [=](gpu::Batch& batch) {
35+ gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
3636
3737 auto primaryFbo = DependencyManager::get<FramebufferCache>()->getPrimaryFramebufferDepthColor();
3838
@@ -166,7 +166,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend · 127 unmodified lines
166166 assert(renderContext->args->_viewFrustum);
167167
168168 RenderArgs* args = renderContext->args;
169− doInBatch(args->_context, [=](gpu::Batch& batch) {
169+ gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
170170 batch.setViewportTransform(args->_viewport);
171171 batch.setStateScissorRect(args->_viewport);
172172 args->_batch = &batch;
@@ -195,7 +195,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const · 22 unmodified lines
195195 assert(renderContext->args->_viewFrustum);
196196
197197 RenderArgs* args = renderContext->args;
198− doInBatch(args->_context, [=](gpu::Batch& batch) {
198+ gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
199199 batch.setViewportTransform(args->_viewport);
200200 batch.setStateScissorRect(args->_viewport);
201201 args->_batch = &batch;
@@ -267,7 +267,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 65 unmodified lines
267267 }
268268
269269 // Render the items
270− doInBatch(args->_context, [=](gpu::Batch& batch) {
270+ gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
271271 args->_batch = &batch;
272272 args->_whiteTexture = DependencyManager::get<TextureCache>()->getWhiteTexture();
273273