1 files changed, 63 insertions, 17 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp
index a544394353..592c29eb15 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.cpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp
@@ -38,37 +38,78 @@ SymbolBucket::SymbolBucket(style::SymbolLayoutProperties::PossiblyEvaluated layo
 
 void SymbolBucket::upload(gl::Context& context) {
     if (hasTextData()) {
-        text.vertexBuffer = context.createVertexBuffer(std::move(text.vertices));
-        text.dynamicVertexBuffer = context.createVertexBuffer(std::move(text.dynamicVertices), gl::BufferUsage::StreamDraw);
-        text.opacityVertexBuffer = context.createVertexBuffer(std::move(text.opacityVertices), gl::BufferUsage::StreamDraw);
-        text.indexBuffer = context.createIndexBuffer(std::move(text.triangles));
+        if (!staticUploaded) {
+            text.indexBuffer = context.createIndexBuffer(std::move(text.triangles));
+            text.vertexBuffer = context.createVertexBuffer(std::move(text.vertices));
+        }
+        if (!dynamicUploaded) {
+            text.dynamicVertexBuffer = context.createVertexBuffer(std::move(text.dynamicVertices), gl::BufferUsage::StreamDraw);
+        }
+        if (!opacityUploaded) {
+            if (!text.opacityVertexBuffer) {
+                text.opacityVertexBuffer = context.createVertexBuffer(std::move(text.opacityVertices), gl::BufferUsage::StreamDraw);
+            } else {
+                context.updateVertexBuffer(*text.opacityVertexBuffer, std::move(text.opacityVertices));
+            }
+        }
     }
 
     if (hasIconData()) {
-        icon.vertexBuffer = context.createVertexBuffer(std::move(icon.vertices));
-        icon.dynamicVertexBuffer = context.createVertexBuffer(std::move(icon.dynamicVertices), gl::BufferUsage::StreamDraw);
-        icon.opacityVertexBuffer = context.createVertexBuffer(std::move(icon.opacityVertices), gl::BufferUsage::StreamDraw);
-        icon.indexBuffer = context.createIndexBuffer(std::move(icon.triangles));
+        if (!staticUploaded) {
+            icon.indexBuffer = context.createIndexBuffer(std::move(icon.triangles));
+            icon.vertexBuffer = context.createVertexBuffer(std::move(icon.vertices));
+        }
+        if (!dynamicUploaded) {
+            icon.dynamicVertexBuffer = context.createVertexBuffer(std::move(icon.dynamicVertices), gl::BufferUsage::StreamDraw);
+        }
+        if (!opacityUploaded) {
+            if (!icon.opacityVertexBuffer) {
+                icon.opacityVertexBuffer = context.createVertexBuffer(std::move(icon.opacityVertices), gl::BufferUsage::StreamDraw);
+            } else {
+                context.updateVertexBuffer(*icon.opacityVertexBuffer, std::move(icon.opacityVertices));
+            }
+        }
     }
 
     if (hasCollisionBoxData()) {
-        collisionBox.vertexBuffer = context.createVertexBuffer(std::move(collisionBox.vertices));
-        collisionBox.opacityVertexBuffer = context.createVertexBuffer(std::move(collisionBox.opacityVertices), gl::BufferUsage::StreamDraw);
-        collisionBox.indexBuffer = context.createIndexBuffer(std::move(collisionBox.lines));
+        if (!staticUploaded) {
+            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);
+            } else {
+                context.updateVertexBuffer(*collisionBox.opacityVertexBuffer, std::move(collisionBox.opacityVertices));
+            }
+        }
     }
     
     if (hasCollisionCircleData()) {
-        collisionCircle.vertexBuffer = context.createVertexBuffer(std::move(collisionCircle.vertices));
-        collisionCircle.opacityVertexBuffer = context.createVertexBuffer(std::move(collisionCircle.opacityVertices), gl::BufferUsage::StreamDraw);
-        collisionCircle.indexBuffer = context.createIndexBuffer(std::move(collisionCircle.triangles));
+        if (!staticUploaded) {
+            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);
+            } else {
+                context.updateVertexBuffer(*collisionCircle.opacityVertexBuffer, std::move(collisionCircle.opacityVertices));
+            }
+        }
     }
 
-    for (auto& pair : paintPropertyBinders) {
-        pair.second.first.upload(context);
-        pair.second.second.upload(context);
+    if (!staticUploaded) {
+        for (auto& pair : paintPropertyBinders) {
+            pair.second.first.upload(context);
+            pair.second.second.upload(context);
+        }
     }
 
     uploaded = true;
+    staticUploaded = true;
+    opacityUploaded = true;
+    dynamicUploaded = true;
 }
 
 bool SymbolBucket::hasData() const {
@@ -91,4 +132,9 @@ bool SymbolBucket::hasCollisionCircleData() const {
     return !collisionCircle.segments.empty();
 }
 
+void SymbolBucket::updateOpacity() {
+    opacityUploaded = false;
+    uploaded = false;
+}
+
 } // namespace mbgl