1 files changed, 99 insertions, 86 deletions
diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt
index 95b330992b..11b4418aad 100644
--- a/next/CMakeLists.txt
+++ b/next/CMakeLists.txt
@@ -23,6 +23,7 @@ option(MBGL_WITH_COVERAGE "Enable code coverage collection" OFF)
 option(MBGL_WITH_QT "Build Mapbox GL Qt bindings" OFF)
 option(MBGL_WITH_SANITIZER "Use [address|thread|undefined] here" OFF)
 option(MBGL_WITH_RTTI "Compile with runtime type information" OFF)
+option(MBGL_WITH_OPENGL "Build with OpenGL renderer" ON)
 
 add_library(
     mbgl-compiler-options INTERFACE
@@ -93,16 +94,12 @@ add_library(
     ${MBGL_ROOT}/include/mbgl/actor/message.hpp
     ${MBGL_ROOT}/include/mbgl/actor/scheduler.hpp
     ${MBGL_ROOT}/include/mbgl/annotation/annotation.hpp
-    ${MBGL_ROOT}/include/mbgl/gfx/backend.hpp
     ${MBGL_ROOT}/include/mbgl/gfx/backend_scope.hpp
     ${MBGL_ROOT}/include/mbgl/gfx/renderable.hpp
     ${MBGL_ROOT}/include/mbgl/gfx/renderer_backend.hpp
     ${MBGL_ROOT}/include/mbgl/gfx/rendering_stats.hpp
-    ${MBGL_ROOT}/include/mbgl/gl/renderable_resource.hpp
-    ${MBGL_ROOT}/include/mbgl/gl/renderer_backend.hpp
     ${MBGL_ROOT}/include/mbgl/layermanager/background_layer_factory.hpp
     ${MBGL_ROOT}/include/mbgl/layermanager/circle_layer_factory.hpp
-    ${MBGL_ROOT}/include/mbgl/layermanager/custom_layer_factory.hpp
     ${MBGL_ROOT}/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp
     ${MBGL_ROOT}/include/mbgl/layermanager/fill_layer_factory.hpp
     ${MBGL_ROOT}/include/mbgl/layermanager/heatmap_layer_factory.hpp
@@ -124,7 +121,6 @@ add_library(
     ${MBGL_ROOT}/include/mbgl/math/log2.hpp
     ${MBGL_ROOT}/include/mbgl/math/minmax.hpp
     ${MBGL_ROOT}/include/mbgl/math/wrap.hpp
-    ${MBGL_ROOT}/include/mbgl/platform/gl_functions.hpp
     ${MBGL_ROOT}/include/mbgl/platform/thread.hpp
     ${MBGL_ROOT}/include/mbgl/renderer/query.hpp
     ${MBGL_ROOT}/include/mbgl/renderer/renderer.hpp
@@ -200,7 +196,6 @@ add_library(
     ${MBGL_ROOT}/include/mbgl/style/layer_properties.hpp
     ${MBGL_ROOT}/include/mbgl/style/layers/background_layer.hpp
     ${MBGL_ROOT}/include/mbgl/style/layers/circle_layer.hpp
-    ${MBGL_ROOT}/include/mbgl/style/layers/custom_layer.hpp
     ${MBGL_ROOT}/include/mbgl/style/layers/fill_extrusion_layer.hpp
     ${MBGL_ROOT}/include/mbgl/style/layers/fill_layer.hpp
     ${MBGL_ROOT}/include/mbgl/style/layers/heatmap_layer.hpp
@@ -324,51 +319,8 @@ add_library(
     ${MBGL_ROOT}/src/mbgl/gfx/upload_pass.hpp
     ${MBGL_ROOT}/src/mbgl/gfx/vertex_buffer.hpp
     ${MBGL_ROOT}/src/mbgl/gfx/vertex_vector.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/attribute.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/attribute.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/command_encoder.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/command_encoder.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/context.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/context.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/debugging_extension.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/debugging_extension.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/defines.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/draw_scope_resource.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/enum.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/enum.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/extension.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/framebuffer.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/index_buffer_resource.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/index_buffer_resource.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/object.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/object.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/offscreen_texture.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/offscreen_texture.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/program.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/render_pass.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/render_pass.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/renderbuffer_resource.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/renderer_backend.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/state.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/texture.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/texture.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/texture_resource.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/texture_resource.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/types.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/uniform.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/uniform.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/upload_pass.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/upload_pass.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/value.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/value.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/vertex_array.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/vertex_array.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/vertex_array_extension.hpp
-    ${MBGL_ROOT}/src/mbgl/gl/vertex_buffer_resource.cpp
-    ${MBGL_ROOT}/src/mbgl/gl/vertex_buffer_resource.hpp
     ${MBGL_ROOT}/src/mbgl/layermanager/background_layer_factory.cpp
     ${MBGL_ROOT}/src/mbgl/layermanager/circle_layer_factory.cpp
-    ${MBGL_ROOT}/src/mbgl/layermanager/custom_layer_factory.cpp
     ${MBGL_ROOT}/src/mbgl/layermanager/fill_extrusion_layer_factory.cpp
     ${MBGL_ROOT}/src/mbgl/layermanager/fill_layer_factory.cpp
     ${MBGL_ROOT}/src/mbgl/layermanager/heatmap_layer_factory.cpp
@@ -401,7 +353,6 @@ add_library(
     ${MBGL_ROOT}/src/mbgl/map/transform_state.hpp
     ${MBGL_ROOT}/src/mbgl/map/zoom_history.hpp
     ${MBGL_ROOT}/src/mbgl/math/log2.cpp
-    ${MBGL_ROOT}/src/mbgl/platform/gl_functions.cpp
     ${MBGL_ROOT}/src/mbgl/programs/attributes.hpp
     ${MBGL_ROOT}/src/mbgl/programs/background_pattern_program.hpp
     ${MBGL_ROOT}/src/mbgl/programs/background_program.cpp
@@ -423,37 +374,6 @@ add_library(
     ${MBGL_ROOT}/src/mbgl/programs/fill_pattern_program.hpp
     ${MBGL_ROOT}/src/mbgl/programs/fill_program.cpp
     ${MBGL_ROOT}/src/mbgl/programs/fill_program.hpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/background.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/background_pattern.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/circle.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/clipping_mask.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/collision_box.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/collision_circle.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/debug.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/fill.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/fill_extrusion.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/fill_extrusion_pattern.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/fill_outline.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/fill_outline_pattern.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/fill_pattern.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/heatmap.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/heatmap_texture.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/hillshade.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/hillshade_prepare.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/line.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/line_gradient.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/line_pattern.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/line_sdf.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/preludes.hpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/raster.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/shader_source.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/shader_source.hpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/shaders.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/shaders.hpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_icon.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_sdf_icon.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_sdf_text.cpp
-    ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_text_and_icon.cpp
     ${MBGL_ROOT}/src/mbgl/programs/heatmap_program.cpp
     ${MBGL_ROOT}/src/mbgl/programs/heatmap_program.hpp
     ${MBGL_ROOT}/src/mbgl/programs/heatmap_texture_program.cpp
@@ -519,8 +439,6 @@ add_library(
     ${MBGL_ROOT}/src/mbgl/renderer/layers/render_background_layer.hpp
     ${MBGL_ROOT}/src/mbgl/renderer/layers/render_circle_layer.cpp
     ${MBGL_ROOT}/src/mbgl/renderer/layers/render_circle_layer.hpp
-    ${MBGL_ROOT}/src/mbgl/renderer/layers/render_custom_layer.cpp
-    ${MBGL_ROOT}/src/mbgl/renderer/layers/render_custom_layer.hpp
     ${MBGL_ROOT}/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
     ${MBGL_ROOT}/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp
     ${MBGL_ROOT}/src/mbgl/renderer/layers/render_fill_layer.cpp
@@ -679,9 +597,6 @@ add_library(
     ${MBGL_ROOT}/src/mbgl/style/layers/circle_layer_impl.hpp
     ${MBGL_ROOT}/src/mbgl/style/layers/circle_layer_properties.cpp
     ${MBGL_ROOT}/src/mbgl/style/layers/circle_layer_properties.hpp
-    ${MBGL_ROOT}/src/mbgl/style/layers/custom_layer.cpp
-    ${MBGL_ROOT}/src/mbgl/style/layers/custom_layer_impl.cpp
-    ${MBGL_ROOT}/src/mbgl/style/layers/custom_layer_impl.hpp
     ${MBGL_ROOT}/src/mbgl/style/layers/fill_extrusion_layer.cpp
     ${MBGL_ROOT}/src/mbgl/style/layers/fill_extrusion_layer_impl.cpp
     ${MBGL_ROOT}/src/mbgl/style/layers/fill_extrusion_layer_impl.hpp
@@ -885,6 +800,104 @@ add_library(
     ${MBGL_ROOT}/src/parsedate/parsedate.hpp
 )
 
+if(MBGL_WITH_OPENGL)
+    message("-- Configuring GL-Native with OpenGL renderer backend")
+    target_compile_definitions(
+        mbgl-core
+        PRIVATE MBGL_RENDER_BACKEND_OPENGL=1
+    )
+    target_sources(
+        mbgl-core
+        PRIVATE
+            ${MBGL_ROOT}/include/mbgl/gfx/backend.hpp
+            ${MBGL_ROOT}/include/mbgl/gl/custom_layer.hpp
+            ${MBGL_ROOT}/include/mbgl/gl/custom_layer_factory.hpp
+            ${MBGL_ROOT}/include/mbgl/gl/renderable_resource.hpp
+            ${MBGL_ROOT}/include/mbgl/gl/renderer_backend.hpp
+            ${MBGL_ROOT}/include/mbgl/platform/gl_functions.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/attribute.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/attribute.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/command_encoder.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/command_encoder.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/context.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/context.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/custom_layer.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/custom_layer_factory.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/custom_layer_impl.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/custom_layer_impl.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/debugging_extension.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/debugging_extension.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/defines.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/draw_scope_resource.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/enum.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/enum.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/extension.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/framebuffer.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/index_buffer_resource.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/index_buffer_resource.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/object.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/object.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/offscreen_texture.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/offscreen_texture.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/program.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/render_pass.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/render_pass.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/renderbuffer_resource.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/renderer_backend.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/render_custom_layer.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/render_custom_layer.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/state.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/texture.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/texture.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/texture_resource.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/texture_resource.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/types.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/uniform.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/uniform.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/upload_pass.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/upload_pass.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/value.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/value.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/vertex_array.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/vertex_array.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/vertex_array_extension.hpp
+            ${MBGL_ROOT}/src/mbgl/gl/vertex_buffer_resource.cpp
+            ${MBGL_ROOT}/src/mbgl/gl/vertex_buffer_resource.hpp
+            ${MBGL_ROOT}/src/mbgl/platform/gl_functions.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/background.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/background_pattern.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/circle.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/clipping_mask.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/collision_box.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/collision_circle.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/debug.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/fill.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/fill_extrusion.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/fill_extrusion_pattern.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/fill_outline.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/fill_outline_pattern.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/fill_pattern.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/heatmap.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/heatmap_texture.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/hillshade.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/hillshade_prepare.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/line.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/line_gradient.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/line_pattern.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/line_sdf.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/preludes.hpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/raster.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/shader_source.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/shader_source.hpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/shaders.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/shaders.hpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_icon.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_sdf_icon.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_sdf_text.cpp
+            ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_text_and_icon.cpp
+    )
+endif()
+
 if(EXISTS ${MBGL_ROOT}/.git/HEAD)
     execute_process(
         COMMAND