From a49fcb3e539665d4c7ab796d2ff8e651c5726916 Mon Sep 17 00:00:00 2001
From: Jonathas Costa <jon.costa@gmail.com>
Date: Mon, 14 Jan 2019 14:30:51 -0500
Subject: [PATCH] Fixed texture scale for HDR.

---
 .../shaders/atmosphere_deferred_fs.glsl       |  3 +-
 src/rendering/framebufferrenderer.cpp         | 63 +++----------------
 2 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index cf3d8bc928..927240acc5 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -708,7 +708,8 @@ void main() {
             }
             bColor /= float(nAaSamples);
             //renderTarget = vec4(HDR(bColor.xyz * backgroundConstant, atmExposure), bColor.a);
-            renderTarget = vec4(bColor.xyz * backgroundConstant, bColor.a);
+            //renderTarget = vec4(bColor.xyz * backgroundConstant, bColor.a);
+            renderTarget = vec4(bColor.xyz , bColor.a);
         } 
         else {
             discard;
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index f22e52fe73..7a04b6d325 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -274,11 +274,11 @@ void FramebufferRenderer::initialize() {
             0
         );
         glDrawBuffers(1, buffers);
-    }
-
-    status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    if (status != GL_FRAMEBUFFER_COMPLETE) {
-        LERROR("Bloom framebuffer is not complete");
+        
+        status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+        if (status != GL_FRAMEBUFFER_COMPLETE) {
+            LERROR(fmt::format("Bloom framebuffer {} is not complete", i));
+        }
     }
 
     // JCC: Moved to here to avoid NVidia: "Program/shader state performance warning"
@@ -452,7 +452,7 @@ void FramebufferRenderer::applyBloomFilter() {
         // Making OpenGL happy...
         ghoul::opengl::TextureUnit dummyTextureUnit;
         dummyTextureUnit.activate();
-        glBindTexture(GL_TEXTURE_2D, _bloomTexture[0]);
+        glBindTexture(GL_TEXTURE_2D, _bloomTexture[2]);
         _bloomProgram->setUniform("filterFirstPass", dummyTextureUnit);
 
         glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -700,7 +700,7 @@ void FramebufferRenderer::updateResolution() {
     for (int i = 0; i < 3; i++)
     {
         glBindTexture(GL_TEXTURE_2D, _bloomTexture[i]);
-        /*glTexImage2D(
+        glTexImage2D(
             GL_TEXTURE_2D,
             0,
             GL_RGBA16F,
@@ -710,55 +710,12 @@ void FramebufferRenderer::updateResolution() {
             GL_RGBA,
             GL_FLOAT,
             nullptr
-        );*/
-        glTexStorage2D(
-            GL_TEXTURE_2D, 
-            1, 
-            GL_RGBA16F, 
-            i ? _resolution.x : _resolution.y, 
-            i ? _resolution.y : _resolution.x
         );
+
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     }
 
-    /*glBindTexture(GL_TEXTURE_2D, _bloomTexture[0]);
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_RGBA32F,
-        _resolution.y,
-        _resolution.x,
-        0,
-        GL_RGBA,
-        GL_FLOAT,
-        nullptr
-    );
-
-    glBindTexture(GL_TEXTURE_2D, _bloomTexture[1]);
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_RGBA32F,
-        _resolution.x,
-        _resolution.y,
-        0,
-        GL_RGBA,
-        GL_FLOAT,
-        nullptr
-    );
-
-    glBindTexture(GL_TEXTURE_2D, _bloomTexture[2]);
-    glTexImage2D(
-        GL_TEXTURE_2D,
-        0,
-        GL_RGBA32F,
-        _resolution.x,
-        _resolution.y,
-        0,
-        GL_RGBA,
-        GL_FLOAT,
-        nullptr
-    );*/
-
     glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _mainPositionTexture);
 
     glTexImage2DMultisample(