diff options
55 files changed, 56 insertions, 56 deletions
diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/gl/gl.hpp index 1e98ea7f3b..59a3bf2ef2 100644 --- a/include/mbgl/platform/gl.hpp +++ b/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 diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp index 68f32ed1ca..8f8d11b297 100644 --- a/include/mbgl/platform/default/headless_view.hpp +++ b/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> diff --git a/include/mbgl/util/gl_helper.hpp b/include/mbgl/util/gl_helper.hpp index 7d104fb80e..d4f60222d0 100644 --- a/include/mbgl/util/gl_helper.hpp +++ b/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> diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 8c7115a1e4..d32f3c81cb 100755 --- a/platform/android/src/native_map_view.cpp +++ b/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 { diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index 83e2c65585..51451bde22 100644 --- a/platform/default/glfw_view.cpp +++ b/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> diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 126328b5fd..2922997fa3 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/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> diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm index 3a92c1901d..82fdff4668 100644 --- a/platform/osx/src/MGLMapView.mm +++ b/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> diff --git a/platform/osx/src/MGLOpenGLLayer.mm b/platform/osx/src/MGLOpenGLLayer.mm index 06a7be961c..e8fa521351 100644 --- a/platform/osx/src/MGLOpenGLLayer.mm +++ b/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 diff --git a/scripts/build-shaders.py b/scripts/build-shaders.py index 226c1a2ecc..4cfb3cb384 100755 --- a/scripts/build-shaders.py +++ b/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 {{ diff --git a/src/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp index c7278a1036..98ccdb687a 100644 --- a/src/mbgl/geometry/buffer.hpp +++ b/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> diff --git a/src/mbgl/geometry/circle_buffer.cpp b/src/mbgl/geometry/circle_buffer.cpp index f4b0cddec3..74ccfa8267 100644 --- a/src/mbgl/geometry/circle_buffer.cpp +++ b/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> diff --git a/src/mbgl/geometry/collision_box_buffer.cpp b/src/mbgl/geometry/collision_box_buffer.cpp index f4f8075e10..a47267d566 100644 --- a/src/mbgl/geometry/collision_box_buffer.cpp +++ b/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> diff --git a/src/mbgl/geometry/debug_font_buffer.cpp b/src/mbgl/geometry/debug_font_buffer.cpp index e4af707660..5df67accd6 100644 --- a/src/mbgl/geometry/debug_font_buffer.cpp +++ b/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> diff --git a/src/mbgl/geometry/fill_buffer.cpp b/src/mbgl/geometry/fill_buffer.cpp index 3392699431..ee70dfc53b 100644 --- a/src/mbgl/geometry/fill_buffer.cpp +++ b/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> diff --git a/src/mbgl/geometry/glyph_atlas.cpp b/src/mbgl/geometry/glyph_atlas.cpp index b90444e582..b74535ffa1 100644 --- a/src/mbgl/geometry/glyph_atlas.cpp +++ b/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> diff --git a/src/mbgl/geometry/glyph_atlas.hpp b/src/mbgl/geometry/glyph_atlas.hpp index 5b4ae1fc6b..06a2d2a76a 100644 --- a/src/mbgl/geometry/glyph_atlas.hpp +++ b/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> diff --git a/src/mbgl/geometry/icon_buffer.cpp b/src/mbgl/geometry/icon_buffer.cpp index 4e6a1c52e7..101132ddbc 100644 --- a/src/mbgl/geometry/icon_buffer.cpp +++ b/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> diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp index bbda2dce6f..96e238c5e6 100644 --- a/src/mbgl/geometry/line_atlas.cpp +++ b/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> diff --git a/src/mbgl/geometry/line_atlas.hpp b/src/mbgl/geometry/line_atlas.hpp index e76a91b61d..b2d7222369 100644 --- a/src/mbgl/geometry/line_atlas.hpp +++ b/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> diff --git a/src/mbgl/geometry/line_buffer.cpp b/src/mbgl/geometry/line_buffer.cpp index f775a4589f..b35d3e8f47 100644 --- a/src/mbgl/geometry/line_buffer.cpp +++ b/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> diff --git a/src/mbgl/geometry/static_vertex_buffer.cpp b/src/mbgl/geometry/static_vertex_buffer.cpp index e8dad0ba9b..254b01b6b6 100644 --- a/src/mbgl/geometry/static_vertex_buffer.cpp +++ b/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 { diff --git a/src/mbgl/geometry/text_buffer.cpp b/src/mbgl/geometry/text_buffer.cpp index 530048a6dd..1aa65146a4 100644 --- a/src/mbgl/geometry/text_buffer.cpp +++ b/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> diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp index 2dcc02c76b..1b3f43806a 100644 --- a/src/mbgl/geometry/vao.hpp +++ b/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> diff --git a/src/mbgl/gl/debugging.cpp b/src/mbgl/gl/debugging.cpp index fb9e037714..e61de42bc3 100644 --- a/src/mbgl/gl/debugging.cpp +++ b/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> diff --git a/src/mbgl/platform/gl.cpp b/src/mbgl/gl/gl.cpp index e5495c80dc..c57717aa87 100644 --- a/src/mbgl/platform/gl.cpp +++ b/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> diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp index b7cbfdf0fe..e50345d0eb 100644 --- a/src/mbgl/renderer/bucket.hpp +++ b/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> diff --git a/src/mbgl/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp index 2d0590c56b..c4eb4e8b0b 100644 --- a/src/mbgl/renderer/debug_bucket.cpp +++ b/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> diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp index ff976c2450..a8b63f58dd 100644 --- a/src/mbgl/renderer/fill_bucket.cpp +++ b/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> diff --git a/src/mbgl/renderer/gl_config.hpp b/src/mbgl/renderer/gl_config.hpp index 2f21b35fe3..4ab1dbb268 100644 --- a/src/mbgl/renderer/gl_config.hpp +++ b/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 { diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp index 83c5b43776..2f648bb67b 100644 --- a/src/mbgl/renderer/line_bucket.cpp +++ b/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> diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 092c164033..3940978835 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/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> diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp index 3fd953fcd6..2cce1f7b18 100644 --- a/src/mbgl/renderer/painter_raster.cpp +++ b/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> diff --git a/src/mbgl/shader/box_shader.cpp b/src/mbgl/shader/box_shader.cpp index d9845ec36f..c9cd9bf091 100644 --- a/src/mbgl/shader/box_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/box_shader.hpp b/src/mbgl/shader/box_shader.hpp index 19df2ca825..bc781dbc15 100644 --- a/src/mbgl/shader/box_shader.hpp +++ b/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 { diff --git a/src/mbgl/shader/circle_shader.cpp b/src/mbgl/shader/circle_shader.cpp index 0af5bcf604..d128f8b699 100644 --- a/src/mbgl/shader/circle_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/dot_shader.cpp b/src/mbgl/shader/dot_shader.cpp index 2eba489b66..12e2ee7845 100644 --- a/src/mbgl/shader/dot_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/icon_shader.cpp b/src/mbgl/shader/icon_shader.cpp index bb43cb3e4a..28d84853de 100644 --- a/src/mbgl/shader/icon_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/line_shader.cpp b/src/mbgl/shader/line_shader.cpp index 54bc6c1148..12790de00a 100644 --- a/src/mbgl/shader/line_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/linepattern_shader.cpp b/src/mbgl/shader/linepattern_shader.cpp index 9e71d0a9d9..18ec2c23f5 100644 --- a/src/mbgl/shader/linepattern_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/linesdf_shader.cpp b/src/mbgl/shader/linesdf_shader.cpp index df988bb337..48622cb763 100644 --- a/src/mbgl/shader/linesdf_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/outline_shader.cpp b/src/mbgl/shader/outline_shader.cpp index 9cda1a1108..df42e09e01 100644 --- a/src/mbgl/shader/outline_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/pattern_shader.cpp b/src/mbgl/shader/pattern_shader.cpp index ef3f35c356..d872e8d976 100644 --- a/src/mbgl/shader/pattern_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/plain_shader.cpp b/src/mbgl/shader/plain_shader.cpp index 1817ffbc3d..1408a42c62 100644 --- a/src/mbgl/shader/plain_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/raster_shader.cpp b/src/mbgl/shader/raster_shader.cpp index aaf0bfd2a5..4b7c0077b3 100644 --- a/src/mbgl/shader/raster_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/sdf_shader.cpp b/src/mbgl/shader/sdf_shader.cpp index 97297a7baf..7ca3bf84de 100644 --- a/src/mbgl/shader/sdf_shader.cpp +++ b/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> diff --git a/src/mbgl/shader/shader.cpp b/src/mbgl/shader/shader.cpp index e8deefc8ff..fbf758d3bf 100644 --- a/src/mbgl/shader/shader.cpp +++ b/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> diff --git a/src/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp index 927fdf0b0b..0570b1c642 100644 --- a/src/mbgl/shader/shader.hpp +++ b/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> diff --git a/src/mbgl/shader/uniform.hpp b/src/mbgl/shader/uniform.hpp index 0b6d574d09..ceeb22bd99 100644 --- a/src/mbgl/shader/uniform.hpp +++ b/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 { diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index be5c59c74c..b35b9e9758 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/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> diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 73b3037ec6..ff3ed2b052 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/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> diff --git a/src/mbgl/util/gl_object_store.cpp b/src/mbgl/util/gl_object_store.cpp index 78d6700237..d6fee17a13 100644 --- a/src/mbgl/util/gl_object_store.cpp +++ b/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> diff --git a/src/mbgl/util/gl_object_store.hpp b/src/mbgl/util/gl_object_store.hpp index 775d4d1d01..e806ac1580 100644 --- a/src/mbgl/util/gl_object_store.hpp +++ b/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> diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp index 704d05e1eb..fea48060a9 100644 --- a/src/mbgl/util/raster.cpp +++ b/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> diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp index 02d6615a9f..807ac11c03 100644 --- a/src/mbgl/util/raster.hpp +++ b/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> diff --git a/src/mbgl/util/texture_pool.hpp b/src/mbgl/util/texture_pool.hpp index a980584c13..db462ab3e3 100644 --- a/src/mbgl/util/texture_pool.hpp +++ b/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> |