[core] Put VertexArrayObject in gl namespace

4 files changed, 9 insertions, 8 deletions

diff --git a/src/mbgl/renderer/debug_bucket.hpp b/src/mbgl/renderer/debug_bucket.hpp
index 59c1e315ea..86ccc6a1b7 100644
--- a/src/mbgl/renderer/debug_bucket.hpp
+++ b/src/mbgl/renderer/debug_bucket.hpp
@@ -39,7 +39,7 @@ public:
 
 private:
     gl::VertexBuffer<PlainVertex> textVertexes;
-    VertexArrayObject array;
+    gl::VertexArrayObject array;
 };
 
 } // namespace mbgl
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index 55f5c654b9..c33ad47020 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -192,7 +192,7 @@ private:
     gl::VertexBuffer<PlainVertex> tileLineStripVertexes;
     gl::VertexBuffer<RasterVertex> rasterVertexes;
 
-    VertexArrayObject tileBorderArray;
+    gl::VertexArrayObject tileBorderArray;
 };
 
 } // namespace mbgl
diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
index c8f3987134..80d6dfe8dd 100644
--- a/src/mbgl/renderer/raster_bucket.cpp
+++ b/src/mbgl/renderer/raster_bucket.cpp
@@ -3,7 +3,7 @@
 #include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/gl/gl.hpp>
-
+#include <mbgl/gl/context.hpp>
 
 namespace mbgl {
 
@@ -27,7 +27,7 @@ void RasterBucket::render(Painter& painter,
 
 void RasterBucket::drawRaster(RasterShader& shader,
                               gl::VertexBuffer<RasterVertex>& vertices,
-                              VertexArrayObject& array,
+                              gl::VertexArrayObject& array,
                               gl::Context& context) {
     assert(texture);
     context.bindTexture(*texture, 0, gl::TextureFilter::Linear);
diff --git a/src/mbgl/renderer/raster_bucket.hpp b/src/mbgl/renderer/raster_bucket.hpp
index 1a23e62133..b0d3ca49c7 100644
--- a/src/mbgl/renderer/raster_bucket.hpp
+++ b/src/mbgl/renderer/raster_bucket.hpp
@@ -2,17 +2,18 @@
 
 #include <mbgl/renderer/bucket.hpp>
 #include <mbgl/util/image.hpp>
-#include <mbgl/gl/context.hpp>
+#include <mbgl/util/optional.hpp>
+#include <mbgl/gl/texture.hpp>
 
 namespace mbgl {
 
 class RasterShader;
 class RasterVertex;
-class StaticRasterVertexBuffer;
-class VertexArrayObject;
 
 namespace gl {
+class Context;
 template <class> class VertexBuffer;
+class VertexArrayObject;
 } // namespace gl
 
 class RasterBucket : public Bucket {
@@ -24,7 +25,7 @@ public:
     bool hasData() const override;
     bool needsClipping() const override;
 
-    void drawRaster(RasterShader&, gl::VertexBuffer<RasterVertex>&, VertexArrayObject&, gl::Context&);
+    void drawRaster(RasterShader&, gl::VertexBuffer<RasterVertex>&, gl::VertexArrayObject&, gl::Context&);
 
 private:
     PremultipliedImage image;