diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-06-02 17:18:19 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@gmail.com> | 2017-06-06 09:01:18 -0700 |
| commit | 967fdfc80eccd28fc0a78d9a5dc7b81dac063bd0 (patch) | |
| tree | 73670b1d03da046d46a8e02c56a49d52be8d1f5d /src/mbgl/renderer/buckets/line_bucket.hpp | |
| parent | 2eaf9978c89a5b73259eaa1bc5dd01ba860eeccf (diff) | |
| download | qtlocation-mapboxgl-967fdfc80eccd28fc0a78d9a5dc7b81dac063bd0.tar.gz | |
[core] [DO NOT MERGE] No longer specialize Segment on Attributes, so that Programs with different bindings can share the same segments.
This change completely disables the VAO optimization that was implemented in segment.hpp -- we need to re-enable it for the common case that a program is only drawing one segment.
Diffstat (limited to 'src/mbgl/renderer/buckets/line_bucket.hpp')
| -rw-r--r-- | src/mbgl/renderer/buckets/line_bucket.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/renderer/buckets/line_bucket.hpp b/src/mbgl/renderer/buckets/line_bucket.hpp index 34d8935953..77a0db6256 100644 --- a/src/mbgl/renderer/buckets/line_bucket.hpp +++ b/src/mbgl/renderer/buckets/line_bucket.hpp @@ -34,7 +34,7 @@ public: gl::VertexVector<LineLayoutVertex> vertices; gl::IndexVector<gl::Triangles> triangles; - gl::SegmentVector<LineAttributes> segments; + gl::SegmentVector segments; optional<gl::VertexBuffer<LineLayoutVertex>> vertexBuffer; optional<gl::IndexBuffer<gl::Triangles>> indexBuffer; |