From bd4a3a5b327aa996cffe8f36f0a37f5d9de87d0f Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Thu, 9 Aug 2018 12:20:36 -0700
Subject: [PATCH] remove unused uniform buffer from polylines

---
 .../src/RenderablePolyLineEntityItem.cpp             | 12 ------------
 .../src/RenderablePolyLineEntityItem.h               |  1 -
 libraries/entities-renderer/src/paintStroke.slf      | 11 -----------
 libraries/entities-renderer/src/paintStroke.slv      |  4 +---
 4 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index 25e8e859aa..743df477ac 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -29,18 +29,12 @@ using namespace render::entities;
 
 static uint8_t CUSTOM_PIPELINE_NUMBER { 0 };
 static const int32_t PAINTSTROKE_TEXTURE_SLOT { 0 };
-// FIXME: This is interfering with the uniform buffers in DeferredLightingEffect.cpp, so use 12 to avoid collisions
-static const int32_t PAINTSTROKE_UNIFORM_SLOT { 12 };
 static gpu::Stream::FormatPointer polylineFormat;
 static gpu::PipelinePointer polylinePipeline;
 #ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
 static gpu::PipelinePointer polylineFadePipeline;
 #endif
 
-struct PolyLineUniforms {
-    glm::vec3 color;
-};
-
 static render::ShapePipelinePointer shapePipelineFactory(const render::ShapePlumber& plumber, const render::ShapeKey& key, gpu::Batch& batch) {
     if (!polylinePipeline) {
         gpu::ShaderPointer program = gpu::Shader::createProgram(shader::entities_renderer::program::paintStroke);
@@ -84,8 +78,6 @@ PolyLineEntityRenderer::PolyLineEntityRenderer(const EntityItemPointer& entity)
         polylineFormat->setAttribute(gpu::Stream::COLOR, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::RGB), offsetof(Vertex, color));
     });
 
-    PolyLineUniforms uniforms;
-    _uniformBuffer = std::make_shared<gpu::Buffer>(sizeof(PolyLineUniforms), (const gpu::Byte*) &uniforms);
     _verticesBuffer = std::make_shared<gpu::Buffer>();
 }
 
@@ -126,9 +118,6 @@ void PolyLineEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&
 }
 
 void PolyLineEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
-    PolyLineUniforms uniforms;
-    uniforms.color = toGlm(entity->getXColor());
-    memcpy(&_uniformBuffer.edit<PolyLineUniforms>(), &uniforms, sizeof(PolyLineUniforms));
     auto pointsChanged = entity->pointsChanged();
     auto strokeWidthsChanged = entity->strokeWidthsChanged();
     auto normalsChanged = entity->normalsChanged();
@@ -274,7 +263,6 @@ void PolyLineEntityRenderer::doRender(RenderArgs* args) {
 
     gpu::Batch& batch = *args->_batch;
     batch.setModelTransform(_polylineTransform);
-    batch.setUniformBuffer(PAINTSTROKE_UNIFORM_SLOT, _uniformBuffer);
 
     if (_texture && _texture->isLoaded()) {
         batch.setResourceTexture(PAINTSTROKE_TEXTURE_SLOT, _texture->getGPUTexture());
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index f460baac59..3ba26c74df 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -65,7 +65,6 @@ protected:
     QVector<glm::vec3> _lastStrokeColors;
     QVector<float> _lastStrokeWidths;
     gpu::BufferPointer _verticesBuffer;
-    gpu::BufferView _uniformBuffer;
     
     uint32_t _numVertices { 0 };
     bool _empty{ true };
diff --git a/libraries/entities-renderer/src/paintStroke.slf b/libraries/entities-renderer/src/paintStroke.slf
index 718e4608b0..211685a9ba 100644
--- a/libraries/entities-renderer/src/paintStroke.slf
+++ b/libraries/entities-renderer/src/paintStroke.slf
@@ -14,7 +14,6 @@
 
 <@include DeferredBufferWrite.slh@>
 
-
 // the albedo texture
 layout(binding=0) uniform sampler2D originalTexture;
 
@@ -23,17 +22,7 @@ layout(location=0) in vec3 interpolatedNormal;
 layout(location=1) in vec2 varTexcoord;
 layout(location=2) in vec4 varColor;
 
-struct PolyLineUniforms {
-    vec3 color;
-};
-
-layout(binding=0) uniform polyLineBuffer {
-    PolyLineUniforms polyline;
-};
-
 void main(void) {
-    
-    
     vec4 texel = texture(originalTexture, varTexcoord);
     int frontCondition = 1 -int(gl_FrontFacing) * 2;
     vec3 color = varColor.rgb;
diff --git a/libraries/entities-renderer/src/paintStroke.slv b/libraries/entities-renderer/src/paintStroke.slv
index 5e7d9f0ae3..ecf52d61cf 100644
--- a/libraries/entities-renderer/src/paintStroke.slv
+++ b/libraries/entities-renderer/src/paintStroke.slv
@@ -26,13 +26,11 @@ layout(location=1) out vec2 varTexcoord;
 layout(location=2) out vec4 varColor;
 
 void main(void) {
-    
     varTexcoord = inTexCoord0.st;
-    
+
     // pass along the diffuse color
     varColor = color_sRGBAToLinear(inColor);
 
-
     // standard transform
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();