From cafd981744e2bc246b647713ab71113e30189935 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 23 Aug 2018 16:17:55 -0700
Subject: [PATCH] Remove uniforms from bloom debug effect

---
 .../gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv  | 10 ++++++++--
 libraries/render-utils/src/BloomEffect.cpp             |  7 +++++--
 libraries/render-utils/src/BloomEffect.h               |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv b/libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv
index d401fc40c2..8849cb494a 100755
--- a/libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv
+++ b/libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv
@@ -21,7 +21,13 @@
 
 <$declareStandardTransform()$>
 
-layout(location=GPU_UNIFORM_TEXCOORD_RECT) uniform vec4 texcoordRect;
+struct TexCoordRectParams {
+    vec4 texcoordRect;
+};
+
+layout(binding=0) uniform texcoordRectBuffer {
+    TexCoordRectParams params;
+};
 
 layout(location=0) out vec2 varTexCoord0;
 
@@ -39,5 +45,5 @@ void main(void) {
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, pos, gl_Position)$>
 
-    varTexCoord0 = ((pos.xy + 1.0) * 0.5) * texcoordRect.zw + texcoordRect.xy;
+    varTexCoord0 = ((pos.xy + 1.0) * 0.5) * params.texcoordRect.zw + params.texcoordRect.xy;
 }
diff --git a/libraries/render-utils/src/BloomEffect.cpp b/libraries/render-utils/src/BloomEffect.cpp
index 3a35e736a9..e6217eb825 100644
--- a/libraries/render-utils/src/BloomEffect.cpp
+++ b/libraries/render-utils/src/BloomEffect.cpp
@@ -184,6 +184,7 @@ void BloomDraw::run(const render::RenderContextPointer& renderContext, const Inp
 }
 
 DebugBloom::DebugBloom() {
+    _params = std::make_shared<gpu::Buffer>(sizeof(glm::vec4), nullptr);
 }
 
 void DebugBloom::configure(const Config& config) {
@@ -227,7 +228,8 @@ void DebugBloom::run(const render::RenderContextPointer& renderContext, const In
 
         Transform modelTransform;
         if (_mode == DebugBloomConfig::MODE_ALL_LEVELS) {
-            batch._glUniform4f(gpu::slot::uniform::TexCoordRect, 0.0f, 0.0f, 1.f, 1.f);
+            _params->setSubData(0, vec4(0.0f, 0.0f, 1.f, 1.f));
+            batch.setUniformBuffer(0, _params);
 
             modelTransform = gpu::Framebuffer::evalSubregionTexcoordTransform(framebufferSize, args->_viewport / 2);
             modelTransform.postTranslate(glm::vec3(-1.0f, 1.0f, 0.0f));
@@ -255,7 +257,8 @@ void DebugBloom::run(const render::RenderContextPointer& renderContext, const In
 
             viewport.z /= 2;
 
-            batch._glUniform4f(gpu::slot::uniform::TexCoordRect, 0.5f, 0.0f, 0.5f, 1.f);
+            _params->setSubData(0, vec4(0.5f, 0.0f, 0.5f, 1.f));
+            batch.setUniformBuffer(0, _params);
 
             modelTransform = gpu::Framebuffer::evalSubregionTexcoordTransform(framebufferSize, viewport);
             modelTransform.postTranslate(glm::vec3(-1.0f, 0.0f, 0.0f));
diff --git a/libraries/render-utils/src/BloomEffect.h b/libraries/render-utils/src/BloomEffect.h
index 7789c70190..12c94bb929 100644
--- a/libraries/render-utils/src/BloomEffect.h
+++ b/libraries/render-utils/src/BloomEffect.h
@@ -121,6 +121,7 @@ public:
 
 private:
     gpu::PipelinePointer _pipeline;
+    gpu::BufferPointer _params;
     DebugBloomConfig::Mode _mode;
 };