tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] No need for optional in map of VertexArrays

Browse Source
This commit is contained in:
John Firebaugh
2017-07-10 12:31:46 -07:00
parent cf83f117f0
commit 902d9442da
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mbgl/programs/program.hpp
View File

@@ -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,

3
src/mbgl/programs/segment.hpp
View File

@@ -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 @@ public:
// 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>

8
src/mbgl/programs/symbol_program.hpp
View File

@@ -371,10 +371,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(
@@ -384,7 +384,7 @@ public:
std::move(stencilMode),
std::move(colorMode),
allUniformValues,
*vertexArray,
vertexArrayIt->second,
Attributes::offsetBindings(allAttributeBindings, segment.vertexOffset),
indexBuffer,
segment.indexOffset,