Merge pull request #5885 from ZappoMan/batchOptimizations

Batch optimizations

samcake committed 11 years ago

Commit 46e9c462 parents 5a80c4d 432dc2014 files · +723 −687Browse files

Showing the changes to interface/src/Application.cpp (1 of 14 files). Show all

Unified · Split

     updateInputModes();
 }
-template<typename F>
-void doInBatch(RenderArgs* args, F f) {
-    gpu::Batch batch;
-    f(batch);
-    args->_context->render(batch);
-}
 void Application::paintGL() {
     PROFILE_RANGE(__FUNCTION__);
     if (nullptr == _displayPlugin) {
             auto mirrorRectDest = glm::ivec4(mirrorRect.z, mirrorRect.y, mirrorRect.x, mirrorRect.w);
             auto selfieFbo = DependencyManager::get<FramebufferCache>()->getSelfieFramebuffer();
-            gpu::Batch batch;
+            doInBatch(renderArgs._context, [=](gpu::Batch& batch) {
-            batch.setFramebuffer(selfieFbo);
+                batch.setFramebuffer(selfieFbo);
-            batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, glm::vec4(0.0f, 0.0f, 0.0f, 0.0f));
+                batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, glm::vec4(0.0f, 0.0f, 0.0f, 0.0f));
-            batch.blit(primaryFbo, mirrorRect, selfieFbo, mirrorRectDest);
+                batch.blit(primaryFbo, mirrorRect, selfieFbo, mirrorRectDest);
-            batch.setFramebuffer(nullptr);
+                batch.setFramebuffer(nullptr);
-            renderArgs._context->render(batch);
+            });
         }
     }
         }
         displaySide(&renderArgs, _myCamera);
         renderArgs._context->enableStereo(false);
-        doInBatch(&renderArgs, [](gpu::Batch& batch) {
+        doInBatch(renderArgs._context, [](gpu::Batch& batch) {
             batch.setFramebuffer(nullptr);
         });
     }
     // Reset the gpu::Context Stages
     // Back to the default framebuffer;
-    gpu::Batch batch;
+    doInBatch(renderArgs._context, [=](gpu::Batch& batch) {
-    batch.resetStages();
+        batch.resetStages();
-    renderArgs._context->render(batch);
+    });
 }
 void Application::runTests() {