Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 117863f

Browse files
kkaeferkkaefer
committed
[build] move headless rendering files to platform/default
1 parent 3bc79e3 commit 117863f

38 files changed

+72
-63
lines changed

‎benchmark/api/query.benchmark.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <mbgl/benchmark/util.hpp>
44
#include <mbgl/map/map.hpp>
5-
#include <mbgl/platform/default/headless_backend.hpp>
6-
#include <mbgl/platform/default/offscreen_view.hpp>
5+
#include <mbgl/gl/headless_backend.hpp>
6+
#include <mbgl/gl/offscreen_view.hpp>
77
#include <mbgl/util/default_thread_pool.hpp>
88
#include <mbgl/sprite/sprite_image.hpp>
99
#include <mbgl/storage/default_file_source.hpp>

‎benchmark/src/mbgl/benchmark/util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <mbgl/benchmark/util.hpp>
2-
#include <mbgl/platform/default/offscreen_view.hpp>
2+
#include <mbgl/gl/offscreen_view.hpp>
33

44
#include <mbgl/map/map.hpp>
55
#include <mbgl/map/view.hpp>

‎bin/render.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include <mbgl/util/io.hpp>
44
#include <mbgl/util/run_loop.hpp>
55

6-
#include <mbgl/platform/default/headless_backend.hpp>
7-
#include <mbgl/platform/default/offscreen_view.hpp>
6+
#include <mbgl/gl/headless_backend.hpp>
7+
#include <mbgl/gl/offscreen_view.hpp>
88
#include <mbgl/util/default_thread_pool.hpp>
99
#include <mbgl/storage/default_file_source.hpp>
1010

‎cmake/core-files.cmake

-5
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,6 @@ set(MBGL_CORE_FILES
137137
src/mbgl/platform/event.cpp
138138
src/mbgl/platform/log.cpp
139139

140-
# platform/default
141-
include/mbgl/platform/default/headless_backend.hpp
142-
include/mbgl/platform/default/headless_display.hpp
143-
include/mbgl/platform/default/offscreen_view.hpp
144-
145140
# programs
146141
src/mbgl/programs/attributes.hpp
147142
src/mbgl/programs/circle_program.cpp

‎cmake/node.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ target_compile_options(mbgl-node
2929

3030
target_include_directories(mbgl-node
3131
PRIVATE src # TODO: eliminate
32+
PRIVATE platform/default
3233
)
3334

3435
target_link_libraries(mbgl-node

‎cmake/render.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ target_compile_options(mbgl-render
99
target_include_directories(mbgl-render
1010
PRIVATE include
1111
PRIVATE src # TODO: eliminate
12+
PRIVATE platform/default
1213
)
1314

1415
target_link_libraries(mbgl-render

‎platform/darwin/src/headless_backend_cgl.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <mbgl/platform/default/headless_backend.hpp>
2-
#include <mbgl/platform/default/headless_display.hpp>
1+
#include <mbgl/gl/headless_backend.hpp>
2+
#include <mbgl/gl/headless_display.hpp>
33

44
#include <OpenGL/OpenGL.h>
55
#include <CoreFoundation/CoreFoundation.h>

‎platform/darwin/src/headless_backend_eagl.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <mbgl/platform/default/headless_backend.hpp>
1+
#include <mbgl/gl/headless_backend.hpp>
22

33
#include <mbgl/gl/extension.hpp>
44

‎platform/darwin/src/headless_display_cgl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <mbgl/platform/default/headless_display.hpp>
1+
#include <mbgl/gl/headless_display.hpp>
22

33
#include <OpenGL/OpenGL.h>
44

‎platform/default/headless_backend_osmesa.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <mbgl/platform/default/headless_backend.hpp>
1+
#include <mbgl/gl/headless_backend.hpp>
22
#include <mbgl/platform/log.hpp>
33

44
#include <GL/osmesa.h>

‎platform/default/headless_backend.cpp ‎platform/default/mbgl/gl/headless_backend.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <mbgl/platform/default/headless_backend.hpp>
2-
#include <mbgl/platform/default/headless_display.hpp>
1+
#include <mbgl/gl/headless_backend.hpp>
2+
#include <mbgl/gl/headless_display.hpp>
33

44
#include <cassert>
55
#include <stdexcept>

‎include/mbgl/platform/default/headless_backend.hpp ‎platform/default/mbgl/gl/headless_backend.hpp

File renamed without changes.

‎platform/default/headless_display.cpp ‎platform/default/mbgl/gl/headless_display.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <mbgl/platform/default/headless_display.hpp>
1+
#include <mbgl/gl/headless_display.hpp>
22

33
namespace mbgl {
44

‎include/mbgl/platform/default/headless_display.hpp ‎platform/default/mbgl/gl/headless_display.hpp

File renamed without changes.

‎platform/default/offscreen_view.cpp ‎platform/default/mbgl/gl/offscreen_view.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <mbgl/platform/default/offscreen_view.hpp>
1+
#include <mbgl/gl/offscreen_view.hpp>
22
#include <mbgl/gl/context.hpp>
33

44
#include <cstring>

‎include/mbgl/platform/default/offscreen_view.hpp ‎platform/default/mbgl/gl/offscreen_view.hpp

File renamed without changes.

‎platform/ios/config.cmake

+6-3
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ macro(mbgl_platform_core)
4242
PRIVATE platform/darwin/src/image.mm
4343

4444
# Headless view
45+
PRIVATE platform/default/mbgl/gl/headless_backend.cpp
46+
PRIVATE platform/default/mbgl/gl/headless_backend.hpp
4547
PRIVATE platform/darwin/src/headless_backend_eagl.mm
46-
PRIVATE platform/default/headless_backend.cpp
47-
PRIVATE platform/default/headless_display.cpp
48-
PRIVATE platform/default/offscreen_view.cpp
48+
PRIVATE platform/default/mbgl/gl/headless_display.cpp
49+
PRIVATE platform/default/mbgl/gl/headless_display.hpp
50+
PRIVATE platform/default/mbgl/gl/offscreen_view.cpp
51+
PRIVATE platform/default/mbgl/gl/offscreen_view.hpp
4952

5053
# Thread pool
5154
PRIVATE platform/default/mbgl/util/default_thread_pool.cpp

‎platform/linux/config.cmake

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ macro(mbgl_platform_core)
1818
if(WITH_OSMESA)
1919
target_sources(mbgl-core
2020
PRIVATE platform/default/headless_backend_osmesa.cpp
21-
PRIVATE platform/default/headless_display.cpp
21+
PRIVATE platform/default/mbgl/gl/headless_display.cpp
2222
)
2323
target_add_mason_package(mbgl-core PUBLIC mesa)
2424
elseif(WITH_EGL)
@@ -78,8 +78,11 @@ macro(mbgl_platform_core)
7878
PRIVATE platform/default/webp_reader.cpp
7979

8080
# Headless view
81-
PRIVATE platform/default/headless_backend.cpp
82-
PRIVATE platform/default/offscreen_view.cpp
81+
PRIVATE platform/default/mbgl/gl/headless_backend.cpp
82+
PRIVATE platform/default/mbgl/gl/headless_backend.hpp
83+
PRIVATE platform/default/mbgl/gl/headless_display.hpp
84+
PRIVATE platform/default/mbgl/gl/offscreen_view.cpp
85+
PRIVATE platform/default/mbgl/gl/offscreen_view.hpp
8386

8487
# Thread pool
8588
PRIVATE platform/default/mbgl/util/default_thread_pool.cpp

‎platform/linux/src/headless_backend_egl.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <mbgl/platform/default/headless_backend.hpp>
2-
#include <mbgl/platform/default/headless_display.hpp>
1+
#include <mbgl/gl/headless_backend.hpp>
2+
#include <mbgl/gl/headless_display.hpp>
33

44
#include <mbgl/platform/log.hpp>
55

‎platform/linux/src/headless_backend_glx.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <mbgl/platform/default/headless_backend.hpp>
2-
#include <mbgl/platform/default/headless_display.hpp>
1+
#include <mbgl/gl/headless_backend.hpp>
2+
#include <mbgl/gl/headless_display.hpp>
33

44
#include <mbgl/platform/log.hpp>
55

‎platform/linux/src/headless_display_egl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <mbgl/platform/default/headless_display.hpp>
1+
#include <mbgl/gl/headless_display.hpp>
22
#include <mbgl/platform/log.hpp>
33
#include <mbgl/util/string.hpp>
44

‎platform/linux/src/headless_display_glx.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <mbgl/platform/default/headless_display.hpp>
1+
#include <mbgl/gl/headless_display.hpp>
22

33
#include <GL/glx.h>
44

‎platform/macos/config.cmake

+5-2
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ macro(mbgl_platform_core)
4242
PRIVATE platform/darwin/src/image.mm
4343

4444
# Headless view
45+
PRIVATE platform/default/mbgl/gl/headless_backend.cpp
46+
PRIVATE platform/default/mbgl/gl/headless_backend.hpp
4547
PRIVATE platform/darwin/src/headless_backend_cgl.cpp
48+
PRIVATE platform/default/mbgl/gl/headless_display.hpp
4649
PRIVATE platform/darwin/src/headless_display_cgl.cpp
47-
PRIVATE platform/default/headless_backend.cpp
48-
PRIVATE platform/default/offscreen_view.cpp
50+
PRIVATE platform/default/mbgl/gl/offscreen_view.cpp
51+
PRIVATE platform/default/mbgl/gl/offscreen_view.hpp
4952

5053
# Thread pool
5154
PRIVATE platform/default/mbgl/util/default_thread_pool.cpp

‎platform/node/src/node_map.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "node_conversion.hpp"
55
#include "node_geojson.hpp"
66

7-
#include <mbgl/platform/default/headless_display.hpp>
7+
#include <mbgl/gl/headless_display.hpp>
88
#include <mbgl/util/exception.hpp>
99
#include <mbgl/style/conversion/source.hpp>
1010
#include <mbgl/style/conversion/layer.hpp>

‎platform/node/src/node_map.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include <mbgl/map/map.hpp>
66
#include <mbgl/storage/file_source.hpp>
7-
#include <mbgl/platform/default/headless_backend.hpp>
8-
#include <mbgl/platform/default/offscreen_view.hpp>
7+
#include <mbgl/gl/headless_backend.hpp>
8+
#include <mbgl/gl/offscreen_view.hpp>
99

1010
#pragma GCC diagnostic push
1111
#pragma GCC diagnostic ignored "-Wunused-parameter"

‎platform/qt/config.cmake

+7-4
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@ endmacro()
4343
macro(mbgl_platform_test)
4444
target_sources(mbgl-test
4545
PRIVATE test/src/main.cpp
46-
PRIVATE platform/qt/test/headless_backend_qt.cpp
4746
PRIVATE platform/qt/test/qmapboxgl.cpp
48-
PRIVATE platform/default/headless_backend.cpp
49-
PRIVATE platform/default/headless_display.cpp
50-
PRIVATE platform/default/offscreen_view.cpp
47+
PRIVATE platform/default/mbgl/gl/headless_backend.cpp
48+
PRIVATE platform/default/mbgl/gl/headless_backend.hpp
49+
PRIVATE platform/default/mbgl/gl/headless_display.cpp
50+
PRIVATE platform/default/mbgl/gl/headless_display.hpp
51+
PRIVATE platform/default/mbgl/gl/offscreen_view.cpp
52+
PRIVATE platform/default/mbgl/gl/offscreen_view.hpp
53+
PRIVATE platform/qt/test/headless_backend_qt.cpp
5154
)
5255

5356
set_source_files_properties(

‎platform/qt/test/headless_backend_qt.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <mbgl/platform/default/headless_backend.hpp>
1+
#include <mbgl/gl/headless_backend.hpp>
22

33
#include <QApplication>
44
#include <QGLContext>

‎test/api/annotations.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include <mbgl/annotation/annotation.hpp>
66
#include <mbgl/sprite/sprite_image.hpp>
77
#include <mbgl/map/map.hpp>
8-
#include <mbgl/platform/default/headless_backend.hpp>
9-
#include <mbgl/platform/default/offscreen_view.hpp>
8+
#include <mbgl/gl/headless_backend.hpp>
9+
#include <mbgl/gl/offscreen_view.hpp>
1010
#include <mbgl/util/io.hpp>
1111
#include <mbgl/util/run_loop.hpp>
1212
#include <mbgl/util/color.hpp>

‎test/api/api_misuse.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include <mbgl/test/fixture_log_observer.hpp>
44

55
#include <mbgl/map/map.hpp>
6-
#include <mbgl/platform/default/headless_backend.hpp>
7-
#include <mbgl/platform/default/offscreen_view.hpp>
6+
#include <mbgl/gl/headless_backend.hpp>
7+
#include <mbgl/gl/offscreen_view.hpp>
88
#include <mbgl/storage/online_file_source.hpp>
99
#include <mbgl/util/default_thread_pool.hpp>
1010
#include <mbgl/util/exception.hpp>

‎test/api/custom_layer.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <mbgl/gl/gl.hpp>
44
#include <mbgl/map/map.hpp>
5-
#include <mbgl/platform/default/headless_backend.hpp>
6-
#include <mbgl/platform/default/offscreen_view.hpp>
5+
#include <mbgl/gl/headless_backend.hpp>
6+
#include <mbgl/gl/offscreen_view.hpp>
77
#include <mbgl/util/default_thread_pool.hpp>
88
#include <mbgl/storage/default_file_source.hpp>
99
#include <mbgl/style/layers/custom_layer.hpp>

‎test/api/query.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <mbgl/map/map.hpp>
2-
#include <mbgl/platform/default/headless_backend.hpp>
3-
#include <mbgl/platform/default/offscreen_view.hpp>
2+
#include <mbgl/gl/headless_backend.hpp>
3+
#include <mbgl/gl/offscreen_view.hpp>
44
#include <mbgl/util/default_thread_pool.hpp>
55
#include <mbgl/sprite/sprite_image.hpp>
66
#include <mbgl/test/stub_file_source.hpp>

‎test/api/render_missing.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <mbgl/test/fixture_log_observer.hpp>
33

44
#include <mbgl/map/map.hpp>
5-
#include <mbgl/platform/default/headless_backend.hpp>
6-
#include <mbgl/platform/default/offscreen_view.hpp>
5+
#include <mbgl/gl/headless_backend.hpp>
6+
#include <mbgl/gl/offscreen_view.hpp>
77
#include <mbgl/util/default_thread_pool.hpp>
88
#include <mbgl/storage/default_file_source.hpp>
99
#include <mbgl/util/image.hpp>

‎test/api/repeated_render.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <mbgl/test/fixture_log_observer.hpp>
33

44
#include <mbgl/map/map.hpp>
5-
#include <mbgl/platform/default/headless_backend.hpp>
6-
#include <mbgl/platform/default/offscreen_view.hpp>
5+
#include <mbgl/gl/headless_backend.hpp>
6+
#include <mbgl/gl/offscreen_view.hpp>
77
#include <mbgl/util/default_thread_pool.hpp>
88
#include <mbgl/storage/default_file_source.hpp>
99
#include <mbgl/util/image.hpp>

‎test/gl/object.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <mbgl/test/util.hpp>
22

3-
#include <mbgl/platform/default/headless_backend.hpp>
4-
#include <mbgl/platform/default/offscreen_view.hpp>
3+
#include <mbgl/gl/headless_backend.hpp>
4+
#include <mbgl/gl/offscreen_view.hpp>
55

66
#include <mbgl/gl/context.hpp>
77

‎test/map/map.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <mbgl/test/fixture_log_observer.hpp>
55

66
#include <mbgl/map/map.hpp>
7-
#include <mbgl/platform/default/headless_backend.hpp>
8-
#include <mbgl/platform/default/offscreen_view.hpp>
7+
#include <mbgl/gl/headless_backend.hpp>
8+
#include <mbgl/gl/offscreen_view.hpp>
99
#include <mbgl/util/default_thread_pool.hpp>
1010
#include <mbgl/sprite/sprite_image.hpp>
1111
#include <mbgl/storage/network_status.hpp>

‎test/src/mbgl/test/util.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <mbgl/test/util.hpp>
22

33
#include <mbgl/map/map.hpp>
4-
#include <mbgl/platform/default/offscreen_view.hpp>
5-
#include <mbgl/platform/default/headless_display.hpp>
4+
#include <mbgl/gl/offscreen_view.hpp>
5+
#include <mbgl/gl/headless_display.hpp>
66
#include <mbgl/platform/log.hpp>
77
#include <mbgl/util/image.hpp>
88
#include <mbgl/util/io.hpp>

‎test/util/memory.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <mbgl/test/util.hpp>
33

44
#include <mbgl/map/map.hpp>
5-
#include <mbgl/platform/default/headless_backend.hpp>
6-
#include <mbgl/platform/default/offscreen_view.hpp>
5+
#include <mbgl/gl/headless_backend.hpp>
6+
#include <mbgl/gl/offscreen_view.hpp>
77
#include <mbgl/util/default_thread_pool.hpp>
88
#include <mbgl/util/io.hpp>
99
#include <mbgl/util/run_loop.hpp>

‎test/util/offscreen_texture.test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <mbgl/gl/gl.hpp>
44
#include <mbgl/gl/context.hpp>
5-
#include <mbgl/platform/default/headless_backend.hpp>
6-
#include <mbgl/platform/default/offscreen_view.hpp>
5+
#include <mbgl/gl/headless_backend.hpp>
6+
#include <mbgl/gl/offscreen_view.hpp>
77

88
#include <mbgl/util/offscreen_texture.hpp>
99

0 commit comments

Comments
 (0)