[core] No need for optional in map of VertexArrays

mapbox · Jul 11, 2017 · a28be5a · a28be5a
1 parent b587e7b
commit a28be5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp
@@ -67,10 +67,10 @@ class Program {
             .concat(paintPropertyBinders.attributeBindings(currentProperties));
 
         for (auto& segment : segments) {
-            optional<gl::VertexArray>& vertexArray = segment.vertexArrays[layerID];
+            auto vertexArrayIt = segment.vertexArrays.find(layerID);
 
-            if (!vertexArray) {
-                vertexArray = context.createVertexArray();
+            if (vertexArrayIt == segment.vertexArrays.end()) {
+                vertexArrayIt = segment.vertexArrays.emplace(layerID, context.createVertexArray()).first;
             }
 
             program.draw(
@@ -80,7 +80,7 @@ class Program {
                 std::move(stencilMode),
                 std::move(colorMode),
                 allUniformValues,
-                *vertexArray,
+                vertexArrayIt->second,
                 Attributes::offsetBindings(allAttributeBindings, segment.vertexOffset),
                 indexBuffer,
                 segment.indexOffset,

diff --git a/src/mbgl/programs/segment.hpp b/src/mbgl/programs/segment.hpp
@@ -2,7 +2,6 @@
 
 #include <mbgl/gl/context.hpp>
 #include <mbgl/gl/vertex_array.hpp>
-#include <mbgl/util/optional.hpp>
 
 #include <cstddef>
 #include <vector>
@@ -35,7 +34,7 @@ class Segment {
     //     data-driven paint properties
     //   * when two fill layers have the same layout properties, but one
     //     uses fill-color and the other uses fill-pattern
-    mutable std::map<std::string, optional<gl::VertexArray>> vertexArrays;
+    mutable std::map<std::string, gl::VertexArray> vertexArrays;
 };
 
 template <class Attributes>

diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
@@ -324,10 +324,10 @@ class SymbolProgram {
             .concat(paintPropertyBinders.attributeBindings(currentProperties));
 
         for (auto& segment : segments) {
-            optional<gl::VertexArray>& vertexArray = segment.vertexArrays[layerID];
+            auto vertexArrayIt = segment.vertexArrays.find(layerID);
 
-            if (!vertexArray) {
-                vertexArray = context.createVertexArray();
+            if (vertexArrayIt == segment.vertexArrays.end()) {
+                vertexArrayIt = segment.vertexArrays.emplace(layerID, context.createVertexArray()).first;
             }
 
             program.draw(
@@ -337,7 +337,7 @@ class SymbolProgram {
                 std::move(stencilMode),
                 std::move(colorMode),
                 allUniformValues,
-                *vertexArray,
+                vertexArrayIt->second,
                 Attributes::offsetBindings(allAttributeBindings, segment.vertexOffset),
                 indexBuffer,
                 segment.indexOffset,