From db7b60f4f004cb5533569d608328c2a164768737 Mon Sep 17 00:00:00 2001
From: Jonathas Costa <jon.costa@gmailcom>
Date: Fri, 21 Jul 2017 11:35:42 -0400
Subject: [PATCH] Moved shader compilation to the same state to avoid
 performance warning in OpenGL.

---
 src/rendering/framebufferrenderer.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 0ab7302814..d1d3a5ed7f 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -1,4 +1,4 @@
-/*****************************************************************************************
+/*****************************************************************************************
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
@@ -129,9 +129,8 @@ void FramebufferRenderer::initialize() {
     updateResolution();
     updateRendererData();
     updateRaycastData();
-    updateDeferredcastData();
-    updateHDRData();
-
+//    updateDeferredcastData();
+    
     glBindFramebuffer(GL_FRAMEBUFFER, _mainFramebuffer);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE, _mainColorTexture, 0);
     // G-buffer
@@ -179,6 +178,10 @@ void FramebufferRenderer::initialize() {
         LERROR("Deferred framebuffer is not complete");
     }
 
+    // JCC: Moved to here to avoid NVidia: "Program/shader state performance warning"
+    updateHDRData();
+    updateDeferredcastData();
+
     glBindFramebuffer(GL_FRAMEBUFFER, defaultFbo);
 
     try {
@@ -685,7 +688,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
         }
     }
 
-    // g-buffer1
+    // g-buffer
     if (!tasks.deferredcasterTasks.empty()) {
         glBindFramebuffer(GL_FRAMEBUFFER, _deferredFramebuffer);
         GLenum dBuffer[1] = { GL_COLOR_ATTACHMENT0 };