From 3ab8025b821afc46f5136914d33a2618da384e11 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 19 Jun 2015 16:14:05 -0700
Subject: [PATCH] Responding to Sam's comments

---
 interface/src/ui/ApplicationOverlay.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp
index 8e5bdca8c0..cae62ef61f 100644
--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@@ -108,9 +108,6 @@ void ApplicationOverlay::renderQmlUi(RenderArgs* renderArgs) {
         gpu::Batch batch;
         auto geometryCache = DependencyManager::get<GeometryCache>();
         geometryCache->useSimpleDrawPipeline(batch);
-        batch._glDisable(GL_DEPTH_TEST);
-        batch._glDisable(GL_LIGHTING);
-        batch._glEnable(GL_BLEND);
         batch.setProjectionTransform(mat4());
         batch.setModelTransform(mat4());
         batch._glBindTexture(GL_TEXTURE_2D, _uiTexture);
@@ -122,6 +119,7 @@ void ApplicationOverlay::renderQmlUi(RenderArgs* renderArgs) {
 
 void ApplicationOverlay::renderOverlays(RenderArgs* renderArgs) {
     glm::vec2 size = qApp->getCanvasSize();
+
     mat4 legacyProjection = glm::ortho<float>(0, size.x, size.y, 0, ORTHO_NEAR_CLIP, ORTHO_FAR_CLIP);
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
@@ -140,6 +138,8 @@ void ApplicationOverlay::renderOverlays(RenderArgs* renderArgs) {
     glMatrixMode(GL_PROJECTION);
     glPopMatrix();
     glMatrixMode(GL_MODELVIEW);
+
+    renderArgs->_context->syncCache();
     fboViewport(_overlayFramebuffer);
 }
 
@@ -184,7 +184,7 @@ void ApplicationOverlay::renderStatsAndLogs(RenderArgs* renderArgs) {
 
 void ApplicationOverlay::renderDomainConnectionStatusBorder(RenderArgs* renderArgs) {
     auto geometryCache = DependencyManager::get<GeometryCache>();
-    std::once_flag once;
+    static std::once_flag once;
     std::call_once(once, [&] {
         QVector<vec2> points;
         static const float B = 0.99f;
@@ -200,9 +200,6 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder(RenderArgs* renderAr
         gpu::Batch batch;
         auto geometryCache = DependencyManager::get<GeometryCache>();
         geometryCache->useSimpleDrawPipeline(batch);
-        batch._glDisable(GL_DEPTH_TEST);
-        batch._glDisable(GL_LIGHTING);
-        batch._glEnable(GL_BLEND);
         batch.setProjectionTransform(mat4());
         batch.setModelTransform(mat4());
         batch.setUniformTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());