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 /cmake | |
| 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 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 119379c25d..e519c8f1ca 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -61,7 +61,6 @@ set(MBGL_CORE_FILES src/mbgl/gl/context.hpp src/mbgl/gl/debugging.cpp src/mbgl/gl/debugging.hpp - src/mbgl/gl/element_group.hpp src/mbgl/gl/extension.cpp src/mbgl/gl/extension.hpp src/mbgl/gl/gl.cpp @@ -143,6 +142,7 @@ set(MBGL_CORE_FILES src/mbgl/renderer/circle_bucket.hpp src/mbgl/renderer/debug_bucket.cpp src/mbgl/renderer/debug_bucket.hpp + src/mbgl/renderer/element_group.hpp src/mbgl/renderer/fill_bucket.cpp src/mbgl/renderer/fill_bucket.hpp src/mbgl/renderer/frame_history.cpp |