From 069620b2d9cdfc7c840dbdae2a4df43b38fb2b8f Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 16 Jul 2015 16:36:48 -0700
Subject: [PATCH] hacking on more naked GL

---
 interface/src/ui/ApplicationOverlay.cpp | 23 ++++++++++++++---------
 interface/src/ui/overlays/Overlays.cpp  |  7 +++----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp
index cfa0390e73..4fa6cbcb92 100644
--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@@ -80,6 +80,7 @@ void ApplicationOverlay::renderOverlay(RenderArgs* renderArgs) {
     // Execute the batch into our framebuffer
 
     gpu::Batch batch;
+    renderArgs->_batch = &batch;
 
     // 1) bind the framebuffer
     //_overlayFramebuffer->bind();
@@ -113,13 +114,17 @@ void ApplicationOverlay::renderOverlay(RenderArgs* renderArgs) {
 
     //_overlayFramebuffer->release(); // now we're done for later composition
     batch.setFramebuffer(nullptr);
+
+    renderArgs->_context->syncCache();
+    renderArgs->_context->render(batch);
+
     CHECK_GL_ERROR();
 }
 
 void ApplicationOverlay::renderQmlUi(RenderArgs* renderArgs) {
     PROFILE_RANGE(__FUNCTION__);
     if (_uiTexture) {
-        gpu::Batch batch;
+        gpu::Batch& batch = *renderArgs->_batch;
         auto geometryCache = DependencyManager::get<GeometryCache>();
 
         geometryCache->useSimpleDrawPipeline(batch);
@@ -130,15 +135,15 @@ void ApplicationOverlay::renderQmlUi(RenderArgs* renderArgs) {
 
         geometryCache->renderUnitQuad(batch, glm::vec4(1));
         
-        renderArgs->_context->syncCache();
-        renderArgs->_context->render(batch);
+        //renderArgs->_context->syncCache();
+        //renderArgs->_context->render(batch);
     }
 }
 
 void ApplicationOverlay::renderOverlays(RenderArgs* renderArgs) {
     PROFILE_RANGE(__FUNCTION__);
 
-    gpu::Batch batch;
+    gpu::Batch& batch = *renderArgs->_batch;
     auto geometryCache = DependencyManager::get<GeometryCache>();
     geometryCache->useSimpleDrawPipeline(batch);
     auto textureCache = DependencyManager::get<TextureCache>();
@@ -163,8 +168,8 @@ void ApplicationOverlay::renderOverlays(RenderArgs* renderArgs) {
         DependencyManager::get<AudioScope>()->render(renderArgs, width, height);
     }
     
-    renderArgs->_context->syncCache();
-    renderArgs->_context->render(batch);
+    //renderArgs->_context->syncCache();
+    //renderArgs->_context->render(batch);
 }
 
 void ApplicationOverlay::renderRearViewToFbo(RenderArgs* renderArgs) {
@@ -208,7 +213,7 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder(RenderArgs* renderAr
     });
     auto nodeList = DependencyManager::get<NodeList>();
     if (nodeList && !nodeList->getDomainHandler().isConnected()) {
-        gpu::Batch batch;
+        gpu::Batch& batch = *renderArgs->_batch;
         auto geometryCache = DependencyManager::get<GeometryCache>();
         geometryCache->useSimpleDrawPipeline(batch);
         batch.setProjectionTransform(mat4());
@@ -223,8 +228,8 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder(RenderArgs* renderAr
         //batch.setModelTransform(glm::scale(mat4(), vec3(scaleAmount)));
 
         geometryCache->renderVertices(batch, gpu::LINE_STRIP, _domainStatusBorder);
-        renderArgs->_context->syncCache();
-        renderArgs->_context->render(batch);
+        //renderArgs->_context->syncCache();
+        //renderArgs->_context->render(batch);
     }
 }
 
diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp
index 8a1aa1014e..343e571bfe 100644
--- a/interface/src/ui/overlays/Overlays.cpp
+++ b/interface/src/ui/overlays/Overlays.cpp
@@ -98,8 +98,7 @@ void Overlays::cleanupOverlaysToDelete() {
 void Overlays::renderHUD(RenderArgs* renderArgs) {
     PROFILE_RANGE(__FUNCTION__);
     QReadLocker lock(&_lock);
-    gpu::Batch batch;
-    renderArgs->_batch = &batch;
+    gpu::Batch& batch = *renderArgs->_batch;
 
     auto geometryCache = DependencyManager::get<GeometryCache>();
     auto textureCache = DependencyManager::get<TextureCache>();
@@ -121,8 +120,8 @@ void Overlays::renderHUD(RenderArgs* renderArgs) {
         thisOverlay->render(renderArgs);
     }
 
-    renderArgs->_context->syncCache();
-    renderArgs->_context->render(batch);
+    //renderArgs->_context->syncCache();
+    //renderArgs->_context->render(batch);
 }
 
 unsigned int Overlays::addOverlay(const QString& type, const QScriptValue& properties) {