[build] Adding a build flag to build without GL if needed (#16120)

* [build] Adding a build flag to build without GL if needed

* [build] Moving custom layer to mbgl/gl

9 files changed, 41 insertions, 43 deletions

diff --git a/src/core-files.json b/src/core-files.json
index fcc508fb3a..3c0e128b18 100644
--- a/src/core-files.json
+++ b/src/core-files.json
@@ -21,11 +21,15 @@
         "src/mbgl/gl/attribute.cpp",
         "src/mbgl/gl/command_encoder.cpp",
         "src/mbgl/gl/context.cpp",
+        "src/mbgl/gl/custom_layer.cpp",
+        "src/mbgl/gl/custom_layer_factory.cpp",
+        "src/mbgl/gl/custom_layer_impl.cpp",
         "src/mbgl/gl/debugging_extension.cpp",
         "src/mbgl/gl/enum.cpp",
         "src/mbgl/gl/index_buffer_resource.cpp",
         "src/mbgl/gl/object.cpp",
         "src/mbgl/gl/offscreen_texture.cpp",
+        "src/mbgl/gl/render_custom_layer.cpp",
         "src/mbgl/gl/render_pass.cpp",
         "src/mbgl/gl/renderer_backend.cpp",
         "src/mbgl/gl/texture.cpp",
@@ -37,7 +41,6 @@
         "src/mbgl/gl/vertex_buffer_resource.cpp",
         "src/mbgl/layermanager/background_layer_factory.cpp",
         "src/mbgl/layermanager/circle_layer_factory.cpp",
-        "src/mbgl/layermanager/custom_layer_factory.cpp",
         "src/mbgl/layermanager/fill_extrusion_layer_factory.cpp",
         "src/mbgl/layermanager/fill_layer_factory.cpp",
         "src/mbgl/layermanager/heatmap_layer_factory.cpp",
@@ -120,7 +123,6 @@
         "src/mbgl/renderer/image_manager.cpp",
         "src/mbgl/renderer/layers/render_background_layer.cpp",
         "src/mbgl/renderer/layers/render_circle_layer.cpp",
-        "src/mbgl/renderer/layers/render_custom_layer.cpp",
         "src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp",
         "src/mbgl/renderer/layers/render_fill_layer.cpp",
         "src/mbgl/renderer/layers/render_heatmap_layer.cpp",
@@ -218,8 +220,6 @@
         "src/mbgl/style/layers/circle_layer.cpp",
         "src/mbgl/style/layers/circle_layer_impl.cpp",
         "src/mbgl/style/layers/circle_layer_properties.cpp",
-        "src/mbgl/style/layers/custom_layer.cpp",
-        "src/mbgl/style/layers/custom_layer_impl.cpp",
         "src/mbgl/style/layers/fill_extrusion_layer.cpp",
         "src/mbgl/style/layers/fill_extrusion_layer_impl.cpp",
         "src/mbgl/style/layers/fill_extrusion_layer_properties.cpp",
@@ -339,13 +339,14 @@
         "mbgl/gfx/renderable.hpp": "include/mbgl/gfx/renderable.hpp",
         "mbgl/gfx/renderer_backend.hpp": "include/mbgl/gfx/renderer_backend.hpp",
         "mbgl/gfx/rendering_stats.hpp": "include/mbgl/gfx/rendering_stats.hpp",
+        "mbgl/gl/custom_layer.hpp": "include/mbgl/gl/custom_layer.hpp",
+        "mbgl/gl/custom_layer_factory.hpp": "include/mbgl/gl/custom_layer_factory.hpp",
         "mbgl/gl/renderable_resource.hpp": "include/mbgl/gl/renderable_resource.hpp",
         "mbgl/gl/renderer_backend.hpp": "include/mbgl/gl/renderer_backend.hpp",
         "mbgl/i18n/collator.hpp": "include/mbgl/i18n/collator.hpp",
         "mbgl/i18n/number_format.hpp": "include/mbgl/i18n/number_format.hpp",
         "mbgl/layermanager/background_layer_factory.hpp": "include/mbgl/layermanager/background_layer_factory.hpp",
         "mbgl/layermanager/circle_layer_factory.hpp": "include/mbgl/layermanager/circle_layer_factory.hpp",
-        "mbgl/layermanager/custom_layer_factory.hpp": "include/mbgl/layermanager/custom_layer_factory.hpp",
         "mbgl/layermanager/fill_extrusion_layer_factory.hpp": "include/mbgl/layermanager/fill_extrusion_layer_factory.hpp",
         "mbgl/layermanager/fill_layer_factory.hpp": "include/mbgl/layermanager/fill_layer_factory.hpp",
         "mbgl/layermanager/heatmap_layer_factory.hpp": "include/mbgl/layermanager/heatmap_layer_factory.hpp",
@@ -443,7 +444,6 @@
         "mbgl/style/layer_properties.hpp": "include/mbgl/style/layer_properties.hpp",
         "mbgl/style/layers/background_layer.hpp": "include/mbgl/style/layers/background_layer.hpp",
         "mbgl/style/layers/circle_layer.hpp": "include/mbgl/style/layers/circle_layer.hpp",
-        "mbgl/style/layers/custom_layer.hpp": "include/mbgl/style/layers/custom_layer.hpp",
         "mbgl/style/layers/fill_extrusion_layer.hpp": "include/mbgl/style/layers/fill_extrusion_layer.hpp",
         "mbgl/style/layers/fill_layer.hpp": "include/mbgl/style/layers/fill_layer.hpp",
         "mbgl/style/layers/heatmap_layer.hpp": "include/mbgl/style/layers/heatmap_layer.hpp",
@@ -558,6 +558,7 @@
         "mbgl/gl/attribute.hpp": "src/mbgl/gl/attribute.hpp",
         "mbgl/gl/command_encoder.hpp": "src/mbgl/gl/command_encoder.hpp",
         "mbgl/gl/context.hpp": "src/mbgl/gl/context.hpp",
+        "mbgl/gl/custom_layer_impl.hpp": "src/mbgl/gl/custom_layer_impl.hpp",
         "mbgl/gl/debugging_extension.hpp": "src/mbgl/gl/debugging_extension.hpp",
         "mbgl/gl/defines.hpp": "src/mbgl/gl/defines.hpp",
         "mbgl/gl/draw_scope_resource.hpp": "src/mbgl/gl/draw_scope_resource.hpp",
@@ -568,6 +569,7 @@
         "mbgl/gl/object.hpp": "src/mbgl/gl/object.hpp",
         "mbgl/gl/offscreen_texture.hpp": "src/mbgl/gl/offscreen_texture.hpp",
         "mbgl/gl/program.hpp": "src/mbgl/gl/program.hpp",
+        "mbgl/gl/render_custom_layer.hpp": "src/mbgl/gl/render_custom_layer.hpp",
         "mbgl/gl/render_pass.hpp": "src/mbgl/gl/render_pass.hpp",
         "mbgl/gl/renderbuffer_resource.hpp": "src/mbgl/gl/renderbuffer_resource.hpp",
         "mbgl/gl/state.hpp": "src/mbgl/gl/state.hpp",
@@ -648,7 +650,6 @@
         "mbgl/renderer/image_manager_observer.hpp": "src/mbgl/renderer/image_manager_observer.hpp",
         "mbgl/renderer/layers/render_background_layer.hpp": "src/mbgl/renderer/layers/render_background_layer.hpp",
         "mbgl/renderer/layers/render_circle_layer.hpp": "src/mbgl/renderer/layers/render_circle_layer.hpp",
-        "mbgl/renderer/layers/render_custom_layer.hpp": "src/mbgl/renderer/layers/render_custom_layer.hpp",
         "mbgl/renderer/layers/render_fill_extrusion_layer.hpp": "src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp",
         "mbgl/renderer/layers/render_fill_layer.hpp": "src/mbgl/renderer/layers/render_fill_layer.hpp",
         "mbgl/renderer/layers/render_heatmap_layer.hpp": "src/mbgl/renderer/layers/render_heatmap_layer.hpp",
@@ -710,7 +711,6 @@
         "mbgl/style/layers/background_layer_properties.hpp": "src/mbgl/style/layers/background_layer_properties.hpp",
         "mbgl/style/layers/circle_layer_impl.hpp": "src/mbgl/style/layers/circle_layer_impl.hpp",
         "mbgl/style/layers/circle_layer_properties.hpp": "src/mbgl/style/layers/circle_layer_properties.hpp",
-        "mbgl/style/layers/custom_layer_impl.hpp": "src/mbgl/style/layers/custom_layer_impl.hpp",
         "mbgl/style/layers/fill_extrusion_layer_impl.hpp": "src/mbgl/style/layers/fill_extrusion_layer_impl.hpp",
         "mbgl/style/layers/fill_extrusion_layer_properties.hpp": "src/mbgl/style/layers/fill_extrusion_layer_properties.hpp",
         "mbgl/style/layers/fill_layer_impl.hpp": "src/mbgl/style/layers/fill_layer_impl.hpp",
diff --git a/src/mbgl/style/layers/custom_layer.cpp b/src/mbgl/gl/custom_layer.cpp
index 30bb2d220e..456467e904 100644
--- a/src/mbgl/style/layers/custom_layer.cpp
+++ b/src/mbgl/gl/custom_layer.cpp
@@ -1,9 +1,8 @@
-#include <mbgl/style/layers/custom_layer.hpp>
-#include <mbgl/style/layers/custom_layer_impl.hpp>
+#include <mbgl/gl/custom_layer.hpp>
+#include <mbgl/gl/custom_layer_impl.hpp>
+#include <mbgl/gl/render_custom_layer.hpp>
 #include <mbgl/style/layer_observer.hpp>
 
-#include <mbgl/renderer/layers/render_custom_layer.hpp>
-
 namespace mbgl {
 namespace style {
 
diff --git a/src/mbgl/layermanager/custom_layer_factory.cpp b/src/mbgl/gl/custom_layer_factory.cpp
index f84f261e79..616d0271e0 100644
--- a/src/mbgl/layermanager/custom_layer_factory.cpp
+++ b/src/mbgl/gl/custom_layer_factory.cpp
@@ -1,8 +1,7 @@
-#include <mbgl/layermanager/custom_layer_factory.hpp>
-
-#include <mbgl/renderer/layers/render_custom_layer.hpp>
-#include <mbgl/style/layers/custom_layer.hpp>
-#include <mbgl/style/layers/custom_layer_impl.hpp>
+#include <mbgl/gl/custom_layer.hpp>
+#include <mbgl/gl/custom_layer_factory.hpp>
+#include <mbgl/gl/custom_layer_impl.hpp>
+#include <mbgl/gl/render_custom_layer.hpp>
 
 namespace mbgl {
 
diff --git a/src/mbgl/style/layers/custom_layer_impl.cpp b/src/mbgl/gl/custom_layer_impl.cpp
index f82cb1ea2c..85df44bc80 100644
--- a/src/mbgl/style/layers/custom_layer_impl.cpp
+++ b/src/mbgl/gl/custom_layer_impl.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/style/layers/custom_layer_impl.hpp>
+#include <mbgl/gl/custom_layer_impl.hpp>
 
 namespace mbgl {
 namespace style {
diff --git a/src/mbgl/style/layers/custom_layer_impl.hpp b/src/mbgl/gl/custom_layer_impl.hpp
index d8b8a7f286..0c9339adf1 100644
--- a/src/mbgl/style/layers/custom_layer_impl.hpp
+++ b/src/mbgl/gl/custom_layer_impl.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <mbgl/gl/custom_layer.hpp>
 #include <mbgl/style/layer_impl.hpp>
 #include <mbgl/style/layer_properties.hpp>
-#include <mbgl/style/layers/custom_layer.hpp>
 
 #include <memory>
 
diff --git a/src/mbgl/renderer/layers/render_custom_layer.cpp b/src/mbgl/gl/render_custom_layer.cpp
index c53286a2a0..bb12ec1fcf 100644
--- a/src/mbgl/renderer/layers/render_custom_layer.cpp
+++ b/src/mbgl/gl/render_custom_layer.cpp
@@ -1,13 +1,13 @@
-#include <mbgl/renderer/layers/render_custom_layer.hpp>
-#include <mbgl/renderer/paint_parameters.hpp>
-#include <mbgl/gfx/renderer_backend.hpp>
 #include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/renderer/bucket.hpp>
-#include <mbgl/platform/gl_functions.hpp>
-#include <mbgl/style/layers/custom_layer_impl.hpp>
-#include <mbgl/map/transform_state.hpp>
+#include <mbgl/gfx/renderer_backend.hpp>
 #include <mbgl/gl/context.hpp>
+#include <mbgl/gl/custom_layer_impl.hpp>
+#include <mbgl/gl/render_custom_layer.hpp>
 #include <mbgl/gl/renderable_resource.hpp>
+#include <mbgl/map/transform_state.hpp>
+#include <mbgl/platform/gl_functions.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/renderer/paint_parameters.hpp>
 #include <mbgl/util/mat4.hpp>
 
 namespace mbgl {
diff --git a/src/mbgl/renderer/layers/render_custom_layer.hpp b/src/mbgl/gl/render_custom_layer.hpp
index 698621eae6..2f5ae28209 100644
--- a/src/mbgl/renderer/layers/render_custom_layer.hpp
+++ b/src/mbgl/gl/render_custom_layer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <mbgl/gl/custom_layer_impl.hpp>
 #include <mbgl/renderer/render_layer.hpp>
-#include <mbgl/style/layers/custom_layer_impl.hpp>
 
 namespace mbgl {
 
diff --git a/src/mbgl/style/style_impl.cpp b/src/mbgl/style/style_impl.cpp
index d5961b5901..5b52f1d72c 100644
--- a/src/mbgl/style/style_impl.cpp
+++ b/src/mbgl/style/style_impl.cpp
@@ -1,3 +1,4 @@
+#include <mbgl/gl/custom_layer.hpp>
 #include <mbgl/sprite/sprite_loader.hpp>
 #include <mbgl/storage/file_source.hpp>
 #include <mbgl/storage/resource.hpp>
@@ -6,7 +7,6 @@
 #include <mbgl/style/layer_impl.hpp>
 #include <mbgl/style/layers/background_layer.hpp>
 #include <mbgl/style/layers/circle_layer.hpp>
-#include <mbgl/style/layers/custom_layer.hpp>
 #include <mbgl/style/layers/fill_extrusion_layer.hpp>
 #include <mbgl/style/layers/fill_layer.hpp>
 #include <mbgl/style/layers/heatmap_layer.hpp>
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 04ee5f9df7..0271aceb35 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -1,25 +1,25 @@
 #include <mbgl/tile/geometry_tile.hpp>
 
-#include <mbgl/tile/geometry_tile_worker.hpp>
-#include <mbgl/tile/geometry_tile_data.hpp>
-#include <mbgl/tile/tile_observer.hpp>
-#include <mbgl/style/layer_impl.hpp>
-#include <mbgl/style/layers/background_layer.hpp>
-#include <mbgl/style/layers/custom_layer.hpp>
-#include <mbgl/renderer/render_source.hpp>
-#include <mbgl/renderer/tile_parameters.hpp>
+#include <mbgl/actor/scheduler.hpp>
+#include <mbgl/geometry/feature_index.hpp>
+#include <mbgl/gl/custom_layer.hpp>
+#include <mbgl/gl/render_custom_layer.hpp>
+#include <mbgl/map/transform_state.hpp>
+#include <mbgl/renderer/buckets/symbol_bucket.hpp>
+#include <mbgl/renderer/image_atlas.hpp>
 #include <mbgl/renderer/layers/render_background_layer.hpp>
-#include <mbgl/renderer/layers/render_custom_layer.hpp>
 #include <mbgl/renderer/layers/render_symbol_layer.hpp>
-#include <mbgl/renderer/buckets/symbol_bucket.hpp>
 #include <mbgl/renderer/query.hpp>
+#include <mbgl/renderer/render_source.hpp>
+#include <mbgl/renderer/tile_parameters.hpp>
+#include <mbgl/renderer/tile_render_data.hpp>
+#include <mbgl/style/layer_impl.hpp>
+#include <mbgl/style/layers/background_layer.hpp>
 #include <mbgl/text/glyph_atlas.hpp>
-#include <mbgl/renderer/image_atlas.hpp>
-#include <mbgl/geometry/feature_index.hpp>
-#include <mbgl/map/transform_state.hpp>
+#include <mbgl/tile/geometry_tile_data.hpp>
+#include <mbgl/tile/geometry_tile_worker.hpp>
+#include <mbgl/tile/tile_observer.hpp>
 #include <mbgl/util/logging.hpp>
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/renderer/tile_render_data.hpp>
 
 #include <mbgl/gfx/upload_pass.hpp>