diff options
38 files changed, 72 insertions, 63 deletions
diff --git a/benchmark/api/query.benchmark.cpp b/benchmark/api/query.benchmark.cpp index dce878ea65..ba696876cd 100644 --- a/benchmark/api/query.benchmark.cpp +++ b/benchmark/api/query.benchmark.cpp @@ -2,8 +2,8 @@ #include <mbgl/benchmark/util.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/storage/default_file_source.hpp> diff --git a/benchmark/src/mbgl/benchmark/util.cpp b/benchmark/src/mbgl/benchmark/util.cpp index 0befd7c3e8..87d68ea729 100644 --- a/benchmark/src/mbgl/benchmark/util.cpp +++ b/benchmark/src/mbgl/benchmark/util.cpp @@ -1,5 +1,5 @@ #include <mbgl/benchmark/util.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/map/map.hpp> #include <mbgl/map/view.hpp> diff --git a/bin/render.cpp b/bin/render.cpp index c0348af759..6dd948204c 100644 --- a/bin/render.cpp +++ b/bin/render.cpp @@ -3,8 +3,8 @@ #include <mbgl/util/io.hpp> #include <mbgl/util/run_loop.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index a49b8e5348..4c50911b81 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -137,11 +137,6 @@ set(MBGL_CORE_FILES src/mbgl/platform/event.cpp src/mbgl/platform/log.cpp - # platform/default - include/mbgl/platform/default/headless_backend.hpp - include/mbgl/platform/default/headless_display.hpp - include/mbgl/platform/default/offscreen_view.hpp - # programs src/mbgl/programs/attributes.hpp src/mbgl/programs/circle_program.cpp diff --git a/cmake/node.cmake b/cmake/node.cmake index 8dd95a9419..bb3112cc09 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -29,6 +29,7 @@ target_compile_options(mbgl-node target_include_directories(mbgl-node PRIVATE src # TODO: eliminate + PRIVATE platform/default ) target_link_libraries(mbgl-node diff --git a/cmake/render.cmake b/cmake/render.cmake index f1b09b3c47..395a106642 100644 --- a/cmake/render.cmake +++ b/cmake/render.cmake @@ -9,6 +9,7 @@ target_compile_options(mbgl-render target_include_directories(mbgl-render PRIVATE include PRIVATE src # TODO: eliminate + PRIVATE platform/default ) target_link_libraries(mbgl-render diff --git a/platform/darwin/src/headless_backend_cgl.cpp b/platform/darwin/src/headless_backend_cgl.cpp index dd062dd6af..7069738fb1 100644 --- a/platform/darwin/src/headless_backend_cgl.cpp +++ b/platform/darwin/src/headless_backend_cgl.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/headless_display.hpp> #include <OpenGL/OpenGL.h> #include <CoreFoundation/CoreFoundation.h> diff --git a/platform/darwin/src/headless_backend_eagl.mm b/platform/darwin/src/headless_backend_eagl.mm index aa5efe6de3..bd4a202ec5 100644 --- a/platform/darwin/src/headless_backend_eagl.mm +++ b/platform/darwin/src/headless_backend_eagl.mm @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_backend.hpp> +#include <mbgl/gl/headless_backend.hpp> #include <mbgl/gl/extension.hpp> diff --git a/platform/darwin/src/headless_display_cgl.cpp b/platform/darwin/src/headless_display_cgl.cpp index e2907a80c9..90d187d3db 100644 --- a/platform/darwin/src/headless_display_cgl.cpp +++ b/platform/darwin/src/headless_display_cgl.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_display.hpp> #include <OpenGL/OpenGL.h> diff --git a/platform/default/headless_backend_osmesa.cpp b/platform/default/headless_backend_osmesa.cpp index 04709d4a1b..3dac5913ac 100644 --- a/platform/default/headless_backend_osmesa.cpp +++ b/platform/default/headless_backend_osmesa.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_backend.hpp> +#include <mbgl/gl/headless_backend.hpp> #include <mbgl/platform/log.hpp> #include <GL/osmesa.h> diff --git a/platform/default/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp index 30ce8d2230..0bfdf11c98 100644 --- a/platform/default/headless_backend.cpp +++ b/platform/default/mbgl/gl/headless_backend.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/headless_display.hpp> #include <cassert> #include <stdexcept> diff --git a/include/mbgl/platform/default/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp index da8c55e044..da8c55e044 100644 --- a/include/mbgl/platform/default/headless_backend.hpp +++ b/platform/default/mbgl/gl/headless_backend.hpp diff --git a/platform/default/headless_display.cpp b/platform/default/mbgl/gl/headless_display.cpp index 4ab111f775..6247046c29 100644 --- a/platform/default/headless_display.cpp +++ b/platform/default/mbgl/gl/headless_display.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_display.hpp> namespace mbgl { diff --git a/include/mbgl/platform/default/headless_display.hpp b/platform/default/mbgl/gl/headless_display.hpp index a5c95085b8..a5c95085b8 100644 --- a/include/mbgl/platform/default/headless_display.hpp +++ b/platform/default/mbgl/gl/headless_display.hpp diff --git a/platform/default/offscreen_view.cpp b/platform/default/mbgl/gl/offscreen_view.cpp index 574686ebc9..16faf6a4a9 100644 --- a/platform/default/offscreen_view.cpp +++ b/platform/default/mbgl/gl/offscreen_view.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/gl/context.hpp> #include <cstring> diff --git a/include/mbgl/platform/default/offscreen_view.hpp b/platform/default/mbgl/gl/offscreen_view.hpp index 0e839e14cc..0e839e14cc 100644 --- a/include/mbgl/platform/default/offscreen_view.hpp +++ b/platform/default/mbgl/gl/offscreen_view.hpp diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index 56cb5344ae..565cfc8a13 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -42,10 +42,13 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/image.mm # Headless view + PRIVATE platform/default/mbgl/gl/headless_backend.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.hpp PRIVATE platform/darwin/src/headless_backend_eagl.mm - PRIVATE platform/default/headless_backend.cpp - PRIVATE platform/default/headless_display.cpp - PRIVATE platform/default/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/headless_display.cpp + PRIVATE platform/default/mbgl/gl/headless_display.hpp + PRIVATE platform/default/mbgl/gl/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/offscreen_view.hpp # Thread pool PRIVATE platform/default/mbgl/util/default_thread_pool.cpp diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 312577a185..20679f53e9 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -18,7 +18,7 @@ macro(mbgl_platform_core) if(WITH_OSMESA) target_sources(mbgl-core PRIVATE platform/default/headless_backend_osmesa.cpp - PRIVATE platform/default/headless_display.cpp + PRIVATE platform/default/mbgl/gl/headless_display.cpp ) target_add_mason_package(mbgl-core PUBLIC mesa) elseif(WITH_EGL) @@ -78,8 +78,11 @@ macro(mbgl_platform_core) PRIVATE platform/default/webp_reader.cpp # Headless view - PRIVATE platform/default/headless_backend.cpp - PRIVATE platform/default/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.hpp + PRIVATE platform/default/mbgl/gl/headless_display.hpp + PRIVATE platform/default/mbgl/gl/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/offscreen_view.hpp # Thread pool PRIVATE platform/default/mbgl/util/default_thread_pool.cpp diff --git a/platform/linux/src/headless_backend_egl.cpp b/platform/linux/src/headless_backend_egl.cpp index 0fb33ea0e0..6288cf3805 100644 --- a/platform/linux/src/headless_backend_egl.cpp +++ b/platform/linux/src/headless_backend_egl.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/platform/log.hpp> diff --git a/platform/linux/src/headless_backend_glx.cpp b/platform/linux/src/headless_backend_glx.cpp index e1ea9cef15..79e3fe1390 100644 --- a/platform/linux/src/headless_backend_glx.cpp +++ b/platform/linux/src/headless_backend_glx.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/platform/log.hpp> diff --git a/platform/linux/src/headless_display_egl.cpp b/platform/linux/src/headless_display_egl.cpp index 4be519cfcd..95c2ebb6a6 100644 --- a/platform/linux/src/headless_display_egl.cpp +++ b/platform/linux/src/headless_display_egl.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/util/string.hpp> diff --git a/platform/linux/src/headless_display_glx.cpp b/platform/linux/src/headless_display_glx.cpp index 2023d4dcd2..4275ebb646 100644 --- a/platform/linux/src/headless_display_glx.cpp +++ b/platform/linux/src/headless_display_glx.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_display.hpp> #include <GL/glx.h> diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 13b434117f..6c518becf2 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -42,10 +42,13 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/image.mm # Headless view + PRIVATE platform/default/mbgl/gl/headless_backend.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.hpp PRIVATE platform/darwin/src/headless_backend_cgl.cpp + PRIVATE platform/default/mbgl/gl/headless_display.hpp PRIVATE platform/darwin/src/headless_display_cgl.cpp - PRIVATE platform/default/headless_backend.cpp - PRIVATE platform/default/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/offscreen_view.hpp # Thread pool PRIVATE platform/default/mbgl/util/default_thread_pool.cpp diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index c0f86dfb6a..48a954504c 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -4,7 +4,7 @@ #include "node_conversion.hpp" #include "node_geojson.hpp" -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/util/exception.hpp> #include <mbgl/style/conversion/source.hpp> #include <mbgl/style/conversion/layer.hpp> diff --git a/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp index 20ed1af4f4..c68f543b02 100644 --- a/platform/node/src/node_map.hpp +++ b/platform/node/src/node_map.hpp @@ -4,8 +4,8 @@ #include <mbgl/map/map.hpp> #include <mbgl/storage/file_source.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 80274f5ba1..30781fa428 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -43,11 +43,14 @@ endmacro() macro(mbgl_platform_test) target_sources(mbgl-test PRIVATE test/src/main.cpp - PRIVATE platform/qt/test/headless_backend_qt.cpp PRIVATE platform/qt/test/qmapboxgl.cpp - PRIVATE platform/default/headless_backend.cpp - PRIVATE platform/default/headless_display.cpp - PRIVATE platform/default/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.hpp + PRIVATE platform/default/mbgl/gl/headless_display.cpp + PRIVATE platform/default/mbgl/gl/headless_display.hpp + PRIVATE platform/default/mbgl/gl/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/offscreen_view.hpp + PRIVATE platform/qt/test/headless_backend_qt.cpp ) set_source_files_properties( diff --git a/platform/qt/test/headless_backend_qt.cpp b/platform/qt/test/headless_backend_qt.cpp index f6552c4557..1992cab2fa 100644 --- a/platform/qt/test/headless_backend_qt.cpp +++ b/platform/qt/test/headless_backend_qt.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/headless_backend.hpp> +#include <mbgl/gl/headless_backend.hpp> #include <QApplication> #include <QGLContext> diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp index a06567301f..a56992bc28 100644 --- a/test/api/annotations.test.cpp +++ b/test/api/annotations.test.cpp @@ -5,8 +5,8 @@ #include <mbgl/annotation/annotation.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/util/color.hpp> diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp index d280514499..34272f5366 100644 --- a/test/api/api_misuse.test.cpp +++ b/test/api/api_misuse.test.cpp @@ -3,8 +3,8 @@ #include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/storage/online_file_source.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/exception.hpp> diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp index e58fd0a686..73b4e94af5 100644 --- a/test/api/custom_layer.test.cpp +++ b/test/api/custom_layer.test.cpp @@ -2,8 +2,8 @@ #include <mbgl/gl/gl.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/style/layers/custom_layer.hpp> diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp index a25e4df310..86687fc818 100644 --- a/test/api/query.test.cpp +++ b/test/api/query.test.cpp @@ -1,6 +1,6 @@ #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/test/stub_file_source.hpp> diff --git a/test/api/render_missing.test.cpp b/test/api/render_missing.test.cpp index b209713d0c..a5c59913bc 100644 --- a/test/api/render_missing.test.cpp +++ b/test/api/render_missing.test.cpp @@ -2,8 +2,8 @@ #include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/image.hpp> diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp index a50fb4c6b6..49b9a31b0b 100644 --- a/test/api/repeated_render.test.cpp +++ b/test/api/repeated_render.test.cpp @@ -2,8 +2,8 @@ #include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/image.hpp> diff --git a/test/gl/object.test.cpp b/test/gl/object.test.cpp index 6e1e068c28..f1da93f1da 100644 --- a/test/gl/object.test.cpp +++ b/test/gl/object.test.cpp @@ -1,7 +1,7 @@ #include <mbgl/test/util.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/gl/context.hpp> diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index b945b5e898..0df7c7c2aa 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -4,8 +4,8 @@ #include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/storage/network_status.hpp> diff --git a/test/src/mbgl/test/util.cpp b/test/src/mbgl/test/util.cpp index a3b6117d02..5935750db6 100644 --- a/test/src/mbgl/test/util.cpp +++ b/test/src/mbgl/test/util.cpp @@ -1,8 +1,8 @@ #include <mbgl/test/util.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/headless_display.hpp> +#include <mbgl/gl/offscreen_view.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/io.hpp> diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp index 420967bdf4..984e7a3e24 100644 --- a/test/util/memory.test.cpp +++ b/test/util/memory.test.cpp @@ -2,8 +2,8 @@ #include <mbgl/test/util.hpp> #include <mbgl/map/map.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/test/util/offscreen_texture.test.cpp b/test/util/offscreen_texture.test.cpp index 1d6a6e80e3..31fb985394 100644 --- a/test/util/offscreen_texture.test.cpp +++ b/test/util/offscreen_texture.test.cpp @@ -2,8 +2,8 @@ #include <mbgl/gl/gl.hpp> #include <mbgl/gl/context.hpp> -#include <mbgl/platform/default/headless_backend.hpp> -#include <mbgl/platform/default/offscreen_view.hpp> +#include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/offscreen_view.hpp> #include <mbgl/util/offscreen_texture.hpp> |