From 42d0740ef08be4847d7c9c514fa1bb29dd14fd02 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 26 Aug 2014 14:43:29 -0700
Subject: VertexArrayObject and ElementGroup should be noncopyable

---
 include/mbgl/renderer/fill_bucket.hpp   | 5 +++--
 include/mbgl/renderer/line_bucket.hpp   | 6 +++---
 include/mbgl/renderer/symbol_bucket.hpp | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'include/mbgl/renderer')

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);
-- 
cgit v1.2.1


From c3cb4582250fc9f6bc125cfa11729a502b7d7a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Wed, 27 Aug 2014 12:08:21 +0200
Subject: make ElementGroup and VertexArrayObject movable to avoid using
 unique_ptrs

---
 include/mbgl/renderer/fill_bucket.hpp   | 4 ++--
 include/mbgl/renderer/line_bucket.hpp   | 4 ++--
 include/mbgl/renderer/symbol_bucket.hpp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'include/mbgl/renderer')

diff --git a/include/mbgl/renderer/fill_bucket.hpp b/include/mbgl/renderer/fill_bucket.hpp
index 0cd756318c..15868e4092 100644
--- a/include/mbgl/renderer/fill_bucket.hpp
+++ b/include/mbgl/renderer/fill_bucket.hpp
@@ -34,8 +34,8 @@ class FillBucket : public Bucket {
     static void *realloc(void *data, void *ptr, unsigned int size);
     static void free(void *userData, void *ptr);
 
-    typedef std::unique_ptr<ElementGroup<2>> triangle_group_type;
-    typedef std::unique_ptr<ElementGroup<1>> line_group_type;
+    typedef ElementGroup<2> triangle_group_type;
+    typedef ElementGroup<1> line_group_type;
 
 public:
     FillBucket(FillVertexBuffer& vertexBuffer,
diff --git a/include/mbgl/renderer/line_bucket.hpp b/include/mbgl/renderer/line_bucket.hpp
index 55fe8c4862..c7e375a0a1 100644
--- a/include/mbgl/renderer/line_bucket.hpp
+++ b/include/mbgl/renderer/line_bucket.hpp
@@ -20,8 +20,8 @@ class LinejoinShader;
 struct pbf;
 
 class LineBucket : public Bucket {
-    typedef std::unique_ptr<ElementGroup<1>> triangle_group_type;
-    typedef std::unique_ptr<ElementGroup<1>> point_group_type;
+    typedef ElementGroup<1> triangle_group_type;
+    typedef ElementGroup<1> point_group_type;
 
 public:
     LineBucket(LineVertexBuffer& vertexBuffer,
diff --git a/include/mbgl/renderer/symbol_bucket.hpp b/include/mbgl/renderer/symbol_bucket.hpp
index fccb2924da..fb1678fc8b 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 std::unique_ptr<ElementGroup<1>> TextElementGroup;
-    typedef std::unique_ptr<ElementGroup<1>> IconElementGroup;
+    typedef ElementGroup<1> TextElementGroup;
+    typedef ElementGroup<1> IconElementGroup;
 
 public:
     SymbolBucket(const StyleBucketSymbol &properties, Collision &collision);
-- 
cgit v1.2.1