diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-08-26 14:43:29 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-08-26 14:43:56 -0700 |
commit | 42d0740ef08be4847d7c9c514fa1bb29dd14fd02 (patch) | |
tree | c46346d959452a0f21d56486408ac888ad0a7129 /include/mbgl/renderer | |
parent | 073d1fc9e886e88925176df193eb5eff1dac7675 (diff) | |
download | qtlocation-mapboxgl-42d0740ef08be4847d7c9c514fa1bb29dd14fd02.tar.gz |
VertexArrayObject and ElementGroup should be noncopyable
Diffstat (limited to 'include/mbgl/renderer')
-rw-r--r-- | include/mbgl/renderer/fill_bucket.hpp | 5 | ||||
-rw-r--r-- | include/mbgl/renderer/line_bucket.hpp | 6 | ||||
-rw-r--r-- | include/mbgl/renderer/symbol_bucket.hpp | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/mbgl/renderer/fill_bucket.hpp b/include/mbgl/renderer/fill_bucket.hpp index e8d6bf99e1..0cd756318c 100644 --- a/include/mbgl/renderer/fill_bucket.hpp +++ b/include/mbgl/renderer/fill_bucket.hpp @@ -34,8 +34,9 @@ class FillBucket : public Bucket { static void *realloc(void *data, void *ptr, unsigned int size); static void free(void *userData, void *ptr); - typedef ElementGroup<2> triangle_group_type; - typedef ElementGroup<1> line_group_type; + typedef std::unique_ptr<ElementGroup<2>> triangle_group_type; + typedef std::unique_ptr<ElementGroup<1>> line_group_type; + public: FillBucket(FillVertexBuffer& vertexBuffer, TriangleElementsBuffer& triangleElementsBuffer, diff --git a/include/mbgl/renderer/line_bucket.hpp b/include/mbgl/renderer/line_bucket.hpp index a33dde34e0..55fe8c4862 100644 --- a/include/mbgl/renderer/line_bucket.hpp +++ b/include/mbgl/renderer/line_bucket.hpp @@ -20,8 +20,9 @@ class LinejoinShader; struct pbf; class LineBucket : public Bucket { - typedef ElementGroup<1> triangle_group_type; - typedef ElementGroup<1> point_group_type; + typedef std::unique_ptr<ElementGroup<1>> triangle_group_type; + typedef std::unique_ptr<ElementGroup<1>> point_group_type; + public: LineBucket(LineVertexBuffer& vertexBuffer, TriangleElementsBuffer& triangleElementsBuffer, @@ -43,7 +44,6 @@ public: const StyleBucketLine &properties; private: - LineVertexBuffer& vertexBuffer; TriangleElementsBuffer& triangleElementsBuffer; PointElementsBuffer& pointElementsBuffer; diff --git a/include/mbgl/renderer/symbol_bucket.hpp b/include/mbgl/renderer/symbol_bucket.hpp index fb1678fc8b..fccb2924da 100644 --- a/include/mbgl/renderer/symbol_bucket.hpp +++ b/include/mbgl/renderer/symbol_bucket.hpp @@ -50,8 +50,8 @@ typedef std::vector<Symbol> Symbols; class SymbolBucket : public Bucket { - typedef ElementGroup<1> TextElementGroup; - typedef ElementGroup<1> IconElementGroup; + typedef std::unique_ptr<ElementGroup<1>> TextElementGroup; + typedef std::unique_ptr<ElementGroup<1>> IconElementGroup; public: SymbolBucket(const StyleBucketSymbol &properties, Collision &collision); |