3 files changed, 19 insertions, 19 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp
index f11679aafa..d1b3c3469b 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.cpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp
@@ -50,7 +50,7 @@ void SymbolBucket::upload(gl::Context& context) {
         if (!dynamicUploaded) {
             text.dynamicVertexBuffer = context.createVertexBuffer(std::move(text.dynamicVertices), gl::BufferUsage::StreamDraw);
         }
-        if (!opacityUploaded) {
+        if (!placementChangesUploaded) {
             if (!text.opacityVertexBuffer) {
                 text.opacityVertexBuffer = context.createVertexBuffer(std::move(text.opacityVertices), gl::BufferUsage::StreamDraw);
             } else {
@@ -69,7 +69,7 @@ void SymbolBucket::upload(gl::Context& context) {
         if (!dynamicUploaded) {
             icon.dynamicVertexBuffer = context.createVertexBuffer(std::move(icon.dynamicVertices), gl::BufferUsage::StreamDraw);
         }
-        if (!opacityUploaded) {
+        if (!placementChangesUploaded) {
             if (!icon.opacityVertexBuffer) {
                 icon.opacityVertexBuffer = context.createVertexBuffer(std::move(icon.opacityVertices), gl::BufferUsage::StreamDraw);
             } else {
@@ -83,11 +83,11 @@ void SymbolBucket::upload(gl::Context& context) {
             collisionBox.indexBuffer = context.createIndexBuffer(std::move(collisionBox.lines));
             collisionBox.vertexBuffer = context.createVertexBuffer(std::move(collisionBox.vertices));
         }
-        if (!opacityUploaded) {
-            if (!collisionBox.opacityVertexBuffer) {
-                collisionBox.opacityVertexBuffer = context.createVertexBuffer(std::move(collisionBox.opacityVertices), gl::BufferUsage::StreamDraw);
+        if (!placementChangesUploaded) {
+            if (!collisionBox.dynamicVertexBuffer) {
+                collisionBox.dynamicVertexBuffer = context.createVertexBuffer(std::move(collisionBox.dynamicVertices), gl::BufferUsage::StreamDraw);
             } else {
-                context.updateVertexBuffer(*collisionBox.opacityVertexBuffer, std::move(collisionBox.opacityVertices));
+                context.updateVertexBuffer(*collisionBox.dynamicVertexBuffer, std::move(collisionBox.dynamicVertices));
             }
         }
     }
@@ -97,11 +97,11 @@ void SymbolBucket::upload(gl::Context& context) {
             collisionCircle.indexBuffer = context.createIndexBuffer(std::move(collisionCircle.triangles));
             collisionCircle.vertexBuffer = context.createVertexBuffer(std::move(collisionCircle.vertices));
         }
-        if (!opacityUploaded) {
-            if (!collisionCircle.opacityVertexBuffer) {
-                collisionCircle.opacityVertexBuffer = context.createVertexBuffer(std::move(collisionCircle.opacityVertices), gl::BufferUsage::StreamDraw);
+        if (!placementChangesUploaded) {
+            if (!collisionCircle.dynamicVertexBuffer) {
+                collisionCircle.dynamicVertexBuffer = context.createVertexBuffer(std::move(collisionCircle.dynamicVertices), gl::BufferUsage::StreamDraw);
             } else {
-                context.updateVertexBuffer(*collisionCircle.opacityVertexBuffer, std::move(collisionCircle.opacityVertices));
+                context.updateVertexBuffer(*collisionCircle.dynamicVertexBuffer, std::move(collisionCircle.dynamicVertices));
             }
         }
     }
@@ -115,7 +115,7 @@ void SymbolBucket::upload(gl::Context& context) {
     
     uploaded = true;
     staticUploaded = true;
-    opacityUploaded = true;
+    placementChangesUploaded = true;
     dynamicUploaded = true;
     sortUploaded = true;
 }
@@ -141,7 +141,7 @@ bool SymbolBucket::hasCollisionCircleData() const {
 }
 
 void SymbolBucket::updateOpacity() {
-    opacityUploaded = false;
+    placementChangesUploaded = false;
     uploaded = false;
 }
 
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp
index 5fc3fae8a9..bcf470be87 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.hpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp
@@ -67,7 +67,7 @@ public:
     optional<float> sortedAngle;
 
     bool staticUploaded = false;
-    bool opacityUploaded = false;
+    bool placementChangesUploaded = false;
     bool dynamicUploaded = false;
     bool sortUploaded = false;
 
@@ -112,11 +112,11 @@ public:
 
     struct CollisionBuffer {
         gl::VertexVector<CollisionBoxLayoutAttributes::Vertex> vertices;
-        gl::VertexVector<CollisionBoxOpacityAttributes::Vertex> opacityVertices;
+        gl::VertexVector<CollisionBoxDynamicAttributes::Vertex> dynamicVertices;
         SegmentVector<CollisionBoxProgram::Attributes> segments;
 
         optional<gl::VertexBuffer<CollisionBoxLayoutAttributes::Vertex>> vertexBuffer;
-        optional<gl::VertexBuffer<CollisionBoxOpacityAttributes::Vertex>> opacityVertexBuffer;
+        optional<gl::VertexBuffer<CollisionBoxDynamicAttributes::Vertex>> dynamicVertexBuffer;
     };
 
     struct CollisionBoxBuffer : public CollisionBuffer {
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp
index 7352b766d9..e194c9c857 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp
@@ -237,7 +237,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) {
                 parameters.context,
                 gl::Lines { 1.0f },
                 gl::DepthMode::disabled(),
-                gl::StencilMode::disabled(), // TODO //parameters.stencilModeForClipping(tile.clip),
+                gl::StencilMode::disabled(),
                 parameters.colorModeForRenderPass(),
                 CollisionBoxProgram::UniformValues {
                     uniforms::u_matrix::Value{ tile.matrix },
@@ -245,7 +245,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) {
                     uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() }
                 },
                 *bucket.collisionBox.vertexBuffer,
-                *bucket.collisionBox.opacityVertexBuffer,
+                *bucket.collisionBox.dynamicVertexBuffer,
                 *bucket.collisionBox.indexBuffer,
                 bucket.collisionBox.segments,
                 paintAttributeData,
@@ -271,7 +271,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) {
                 parameters.context,
                 gl::Triangles(),
                 gl::DepthMode::disabled(),
-                gl::StencilMode::disabled(), // TODO //parameters.stencilModeForClipping(tile.clip),
+                gl::StencilMode::disabled(),
                 parameters.colorModeForRenderPass(),
                 CollisionBoxProgram::UniformValues {
                     uniforms::u_matrix::Value{ tile.matrix },
@@ -279,7 +279,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) {
                     uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() }
                 },
                 *bucket.collisionCircle.vertexBuffer,
-                *bucket.collisionCircle.opacityVertexBuffer,
+                *bucket.collisionCircle.dynamicVertexBuffer,
                 *bucket.collisionCircle.indexBuffer,
                 bucket.collisionCircle.segments,
                 paintAttributeData,