diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-10 12:31:46 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-12 14:55:02 -0700 |
| commit | 86ee821c6e8e6e68a984c65492523fdf94425ea7 (patch) | |
| tree | 85d1cc46b9157e5aad18fa7c8def12ee0599f9a6 /src/mbgl/programs/program.hpp | |
| parent | 2691fe165d06e0cc015b28a52815e1b024472a97 (diff) | |
| download | qtlocation-mapboxgl-86ee821c6e8e6e68a984c65492523fdf94425ea7.tar.gz | |
[core] No need for optional in map of VertexArrays
Diffstat (limited to 'src/mbgl/programs/program.hpp')
| -rw-r--r-- | src/mbgl/programs/program.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp index 71d7569f53..bcdb270b9c 100644 --- a/src/mbgl/programs/program.hpp +++ b/src/mbgl/programs/program.hpp @@ -67,10 +67,10 @@ public: .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 @@ public: std::move(stencilMode), std::move(colorMode), allUniformValues, - *vertexArray, + vertexArrayIt->second, Attributes::offsetBindings(allAttributeBindings, segment.vertexOffset), indexBuffer, segment.indexOffset, |