[core] move platform/gl.hpp to gl/gl.hpp

include/mbgl/gl/gl.hpp

@@ -1,5 +1,5 @@
-#ifndef MBGL_RENDERER_GL
-#define MBGL_RENDERER_GL
+#ifndef MBGL_GL_GL
+#define MBGL_GL_GL
 
 //#define GL_TRACK
 

include/mbgl/platform/default/headless_view.hpp

@@ -14,7 +14,7 @@ typedef XID GLXPbuffer;
 #endif
 
 #include <mbgl/mbgl.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <memory>
 #include <thread>

include/mbgl/util/gl_helper.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_UTIL_GL_HELPER
 #define MBGL_UTIL_GL_HELPER
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <array>
 

platform/android/src/native_map_view.cpp

@@ -15,7 +15,7 @@
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/platform/event.hpp>
 #include <mbgl/platform/log.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/constants.hpp>
 
 namespace mbgl {

platform/default/glfw_view.cpp

@@ -2,7 +2,7 @@
 #include <mbgl/annotation/shape_annotation.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/platform/default/glfw_view.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/util/gl_helper.hpp>
 #include <mbgl/util/string.hpp>

platform/ios/src/MGLMapView.mm

@@ -3,7 +3,7 @@
 #import "MGLMapView+MGLCustomStyleLayerAdditions.h"
 
 #import <mbgl/platform/log.hpp>
-#import <mbgl/platform/gl.hpp>
+#import <mbgl/gl/gl.hpp>
 
 #import <GLKit/GLKit.h>
 #import <OpenGLES/EAGL.h>

platform/osx/src/MGLMapView.mm

@@ -18,7 +18,7 @@
 #import <mbgl/annotation/point_annotation.hpp>
 #import <mbgl/map/camera.hpp>
 #import <mbgl/platform/darwin/reachability.h>
-#import <mbgl/platform/gl.hpp>
+#import <mbgl/gl/gl.hpp>
 #import <mbgl/sprite/sprite_image.hpp>
 #import <mbgl/storage/default_file_source.hpp>
 #import <mbgl/storage/network_status.hpp>

platform/osx/src/MGLOpenGLLayer.mm

@@ -2,7 +2,7 @@
 
 #import "MGLMapView_Private.h"
 
-#import <mbgl/platform/gl.hpp>
+#import <mbgl/gl/gl.hpp>
 
 @implementation MGLOpenGLLayer
 

scripts/build-shaders.py

@@ -23,7 +23,7 @@ content = """// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.
 #ifndef MBGL_SHADER_{NAME}_{TYPE}
 #define MBGL_SHADER_{NAME}_{TYPE}
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 namespace mbgl {{
 namespace shaders {{

src/mbgl/geometry/buffer.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_GEOMETRY_BUFFER
 #define MBGL_GEOMETRY_BUFFER
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/util/gl_object_store.hpp>
 #include <mbgl/util/noncopyable.hpp>

src/mbgl/geometry/circle_buffer.cpp

@@ -1,6 +1,6 @@
 #include <mbgl/geometry/circle_buffer.hpp>
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <climits>
 

src/mbgl/geometry/collision_box_buffer.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/geometry/collision_box_buffer.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/math.hpp>
 
 #include <cmath>

src/mbgl/geometry/debug_font_buffer.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/geometry/debug_font_buffer.hpp>
 #include <mbgl/geometry/debug_font_data.hpp>
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <cmath>
 #include <cstring>
 

src/mbgl/geometry/fill_buffer.cpp

@@ -1,6 +1,6 @@
 #include <mbgl/geometry/fill_buffer.hpp>
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <climits>
 

src/mbgl/geometry/glyph_atlas.cpp

@@ -2,7 +2,7 @@
 
 #include <mbgl/text/font_stack.hpp>
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/util/gl_object_store.hpp>

src/mbgl/geometry/glyph_atlas.hpp

@@ -4,7 +4,7 @@
 #include <mbgl/geometry/binpack.hpp>
 #include <mbgl/text/glyph_store.hpp>
 #include <mbgl/util/noncopyable.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <string>
 #include <set>

src/mbgl/geometry/icon_buffer.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/geometry/icon_buffer.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/math.hpp>
 
 #include <cmath>

src/mbgl/geometry/line_atlas.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/geometry/line_atlas.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/util/gl_object_store.hpp>

src/mbgl/geometry/line_atlas.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_GEOMETRY_LINE_ATLAS
 #define MBGL_GEOMETRY_LINE_ATLAS
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <vector>
 #include <map>

src/mbgl/geometry/line_buffer.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/geometry/line_buffer.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cmath>
 

src/mbgl/geometry/static_vertex_buffer.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/geometry/static_vertex_buffer.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 namespace mbgl {
 

src/mbgl/geometry/text_buffer.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/geometry/text_buffer.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/math.hpp>
 
 #include <cmath>

src/mbgl/geometry/vao.hpp

@@ -2,7 +2,7 @@
 #define MBGL_GEOMETRY_VAO
 
 #include <mbgl/shader/shader.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/noncopyable.hpp>
 
 #include <stdexcept>

src/mbgl/gl/debugging.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/gl/debugging.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/platform/event.hpp>
 #include <mbgl/platform/log.hpp>
 

src/mbgl/gl/gl.cpp

@@ -1,4 +1,4 @@
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/platform/log.hpp>
 

src/mbgl/renderer/bucket.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_RENDERER_BUCKET
 #define MBGL_RENDERER_BUCKET
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/renderer/render_pass.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/mat4.hpp>

src/mbgl/renderer/debug_bucket.cpp

@@ -2,7 +2,7 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cassert>
 #include <string>

src/mbgl/renderer/fill_bucket.cpp

@@ -6,7 +6,7 @@
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/shader/pattern_shader.hpp>
 #include <mbgl/shader/outline_shader.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/platform/log.hpp>
 
 #include <cassert>

src/mbgl/renderer/gl_config.hpp

@@ -5,7 +5,7 @@
 #include <tuple>
 #include <array>
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 namespace mbgl {
 namespace gl {

src/mbgl/renderer/line_bucket.cpp

@@ -6,7 +6,7 @@
 #include <mbgl/shader/linesdf_shader.hpp>
 #include <mbgl/shader/linepattern_shader.hpp>
 #include <mbgl/util/math.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cassert>
 

src/mbgl/renderer/painter.hpp

@@ -14,7 +14,7 @@
 
 #include <mbgl/style/types.hpp>
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/chrono.hpp>

src/mbgl/renderer/painter_raster.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/renderer/painter.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 #include <mbgl/layer/raster_layer.hpp>
 #include <mbgl/shader/raster_shader.hpp>

src/mbgl/shader/box_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/box_shader.hpp>
 #include <mbgl/shader/box.vertex.hpp>
 #include <mbgl/shader/box.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/box_shader.hpp

@@ -3,7 +3,7 @@
 
 #include <mbgl/shader/shader.hpp>
 #include <mbgl/shader/uniform.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 namespace mbgl {
 

src/mbgl/shader/circle_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/circle_shader.hpp>
 #include <mbgl/shader/circle.vertex.hpp>
 #include <mbgl/shader/circle.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/dot_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/dot_shader.hpp>
 #include <mbgl/shader/dot.vertex.hpp>
 #include <mbgl/shader/dot.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/icon_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/icon_shader.hpp>
 #include <mbgl/shader/icon.vertex.hpp>
 #include <mbgl/shader/icon.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/line_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/line_shader.hpp>
 #include <mbgl/shader/line.vertex.hpp>
 #include <mbgl/shader/line.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/linepattern_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/linepattern_shader.hpp>
 #include <mbgl/shader/linepattern.vertex.hpp>
 #include <mbgl/shader/linepattern.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/linesdf_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/linesdf_shader.hpp>
 #include <mbgl/shader/linesdf.vertex.hpp>
 #include <mbgl/shader/linesdf.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/outline_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/outline_shader.hpp>
 #include <mbgl/shader/outline.vertex.hpp>
 #include <mbgl/shader/outline.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/pattern_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/pattern_shader.hpp>
 #include <mbgl/shader/pattern.vertex.hpp>
 #include <mbgl/shader/pattern.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/plain_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/shader/plain.vertex.hpp>
 #include <mbgl/shader/plain.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/raster_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/shader/raster.vertex.hpp>
 #include <mbgl/shader/raster.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/sdf_shader.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/shader/sdf_shader.hpp>
 #include <mbgl/shader/sdf.vertex.hpp>
 #include <mbgl/shader/sdf.fragment.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cstdio>
 

src/mbgl/shader/shader.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/shader/shader.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/stopwatch.hpp>
 #include <mbgl/util/exception.hpp>
 #include <mbgl/platform/log.hpp>

src/mbgl/shader/shader.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_RENDERER_SHADER
 #define MBGL_RENDERER_SHADER
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/noncopyable.hpp>
 
 #include <cstdint>

src/mbgl/shader/uniform.hpp

@@ -2,7 +2,7 @@
 #define MBGL_SHADER_UNIFORM
 
 #include <mbgl/shader/shader.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 namespace mbgl {
 

src/mbgl/sprite/sprite_atlas.cpp

@@ -1,6 +1,6 @@
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/sprite/sprite_store.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/util/gl_object_store.hpp>

src/mbgl/sprite/sprite_atlas.hpp

@@ -2,7 +2,7 @@
 #define MBGL_SPRITE_ATLAS
 
 #include <mbgl/geometry/binpack.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/ptr.hpp>
 #include <mbgl/util/optional.hpp>

src/mbgl/util/gl_object_store.cpp

@@ -2,7 +2,7 @@
 
 #include <mbgl/util/thread.hpp>
 #include <mbgl/geometry/vao.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <cassert>
 

src/mbgl/util/gl_object_store.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_MAP_UTIL_GL_OBJECT_STORE
 #define MBGL_MAP_UTIL_GL_OBJECT_STORE
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/noncopyable.hpp>
 
 #include <cstdint>

src/mbgl/util/raster.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/platform/platform.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/platform/log.hpp>
 
 #include <mbgl/util/raster.hpp>

src/mbgl/util/raster.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_UTIL_RASTER
 #define MBGL_UTIL_RASTER
 
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 #include <mbgl/util/texture_pool.hpp>
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/ptr.hpp>

src/mbgl/util/texture_pool.hpp

@@ -2,7 +2,7 @@
 #define MBGL_UTIL_TEXTUREPOOL
 
 #include <mbgl/util/noncopyable.hpp>
-#include <mbgl/platform/gl.hpp>
+#include <mbgl/gl/gl.hpp>
 
 #include <set>
 #include <mutex>