diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-03 11:48:50 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-05 10:52:19 -0700 |
| commit | 9cf57e7142f0e7b599de0f851cd6178d5a6a4c25 (patch) | |
| tree | 185fbfaf15cc55a996731060b92bb24c87ad4378 /src/mbgl/layout/symbol_layout.hpp | |
| parent | e4310aa87489c2db52d7ff65f71e51cc6c9700b6 (diff) | |
| download | qtlocation-mapboxgl-9cf57e7142f0e7b599de0f851cd6178d5a6a4c25.tar.gz | |
[core] Make ElementGroup safer
Template on shader types, rather than count. This allows the compiler to enforce using the correct VAO for the shader and PaintMode. This fixes OverdrawMode with circle layers.
While here, avoid using unique_ptrs for groups. Instead, ensure ElementGroup is movable.
Diffstat (limited to 'src/mbgl/layout/symbol_layout.hpp')
| -rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index c4e6455794..54acf84aaf 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -70,7 +70,7 @@ private: void addToDebugBuffers(CollisionTile&, SymbolBucket&); // Adds placed items to the buffer. - template <typename Buffer, typename GroupType> + template <typename Buffer> void addSymbols(Buffer&, const SymbolQuads&, float scale, const bool keepUpright, const style::SymbolPlacementType, const float placementAngle); |