diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-27 12:36:48 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-27 12:36:48 +0200 |
commit | 312cae1a05af9046b44f810b267c3e81acdb29e5 (patch) | |
tree | 2a636885d6582f7945826cd703e216d88f5deac4 /include/mbgl/renderer | |
parent | 489b6642322065111c41bccbcda8ee92ef1f2a44 (diff) | |
parent | c8d76867db12149fbbe9c4652268c9c1cf0c7891 (diff) | |
download | qtlocation-mapboxgl-312cae1a05af9046b44f810b267c3e81acdb29e5.tar.gz |
Merge pull request #451 from mapbox/noncopyable-vao
VertexArrayObject and ElementGroup should be noncopyable
Diffstat (limited to 'include/mbgl/renderer')
-rw-r--r-- | include/mbgl/renderer/fill_bucket.hpp | 1 | ||||
-rw-r--r-- | include/mbgl/renderer/line_bucket.hpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/mbgl/renderer/fill_bucket.hpp b/include/mbgl/renderer/fill_bucket.hpp index e8d6bf99e1..15868e4092 100644 --- a/include/mbgl/renderer/fill_bucket.hpp +++ b/include/mbgl/renderer/fill_bucket.hpp @@ -36,6 +36,7 @@ class FillBucket : public Bucket { typedef ElementGroup<2> triangle_group_type; typedef 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..c7e375a0a1 100644 --- a/include/mbgl/renderer/line_bucket.hpp +++ b/include/mbgl/renderer/line_bucket.hpp @@ -22,6 +22,7 @@ struct pbf; class LineBucket : public Bucket { typedef ElementGroup<1> triangle_group_type; typedef 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; |