diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2017-04-21 09:19:47 -0700 |
|---|---|---|
| committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-04-25 17:23:54 -0700 |
| commit | 3c175adf30546fe58713b8fed29ac35a85e150be (patch) | |
| tree | 5666e9bcf311ed1b86a13444e50dc7a030c10da9 /cmake | |
| parent | ea8ec38df156c6683c886253dbb1f6bc828686ff (diff) | |
| download | qtlocation-mapboxgl-3c175adf30546fe58713b8fed29ac35a85e150be.tar.gz | |
[core] split off render layers
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 29 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 4 |
2 files changed, 28 insertions, 5 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index a0c46c7cd4..602cf90dad 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -154,6 +154,8 @@ set(MBGL_CORE_FILES # renderer src/mbgl/renderer/bucket.hpp + src/mbgl/renderer/bucket_parameters.cpp + src/mbgl/renderer/bucket_parameters.hpp src/mbgl/renderer/circle_bucket.cpp src/mbgl/renderer/circle_bucket.hpp src/mbgl/renderer/debug_bucket.cpp @@ -162,6 +164,8 @@ set(MBGL_CORE_FILES src/mbgl/renderer/fill_bucket.hpp src/mbgl/renderer/frame_history.cpp src/mbgl/renderer/frame_history.hpp + src/mbgl/renderer/group_by_layout.cpp + src/mbgl/renderer/group_by_layout.hpp src/mbgl/renderer/line_bucket.cpp src/mbgl/renderer/line_bucket.hpp src/mbgl/renderer/paint_parameters.hpp @@ -177,8 +181,26 @@ set(MBGL_CORE_FILES src/mbgl/renderer/painter_symbol.cpp src/mbgl/renderer/raster_bucket.cpp src/mbgl/renderer/raster_bucket.hpp + src/mbgl/renderer/render_background_layer.cpp + src/mbgl/renderer/render_background_layer.hpp + src/mbgl/renderer/render_circle_layer.cpp + src/mbgl/renderer/render_circle_layer.hpp + src/mbgl/renderer/render_custom_layer.cpp + src/mbgl/renderer/render_custom_layer.hpp + src/mbgl/renderer/render_fill_extrusion_layer.cpp + src/mbgl/renderer/render_fill_extrusion_layer.hpp + src/mbgl/renderer/render_fill_layer.cpp + src/mbgl/renderer/render_fill_layer.hpp src/mbgl/renderer/render_item.hpp + src/mbgl/renderer/render_layer.cpp + src/mbgl/renderer/render_layer.hpp + src/mbgl/renderer/render_line_layer.cpp + src/mbgl/renderer/render_line_layer.hpp src/mbgl/renderer/render_pass.hpp + src/mbgl/renderer/render_raster_layer.cpp + src/mbgl/renderer/render_raster_layer.hpp + src/mbgl/renderer/render_symbol_layer.cpp + src/mbgl/renderer/render_symbol_layer.hpp src/mbgl/renderer/render_tile.cpp src/mbgl/renderer/render_tile.hpp src/mbgl/renderer/symbol_bucket.cpp @@ -247,22 +269,19 @@ set(MBGL_CORE_FILES include/mbgl/style/filter_evaluator.hpp include/mbgl/style/image.hpp include/mbgl/style/layer.hpp + include/mbgl/style/layer_type.hpp include/mbgl/style/property_value.hpp include/mbgl/style/query.hpp include/mbgl/style/source.hpp include/mbgl/style/transition_options.hpp include/mbgl/style/types.hpp include/mbgl/style/undefined.hpp - src/mbgl/style/bucket_parameters.cpp - src/mbgl/style/bucket_parameters.hpp src/mbgl/style/cascade_parameters.hpp src/mbgl/style/class_dictionary.cpp src/mbgl/style/class_dictionary.hpp src/mbgl/style/cross_faded_property_evaluator.cpp src/mbgl/style/cross_faded_property_evaluator.hpp src/mbgl/style/data_driven_property_evaluator.hpp - src/mbgl/style/group_by_layout.cpp - src/mbgl/style/group_by_layout.hpp src/mbgl/style/image.cpp src/mbgl/style/layer.cpp src/mbgl/style/layer_impl.cpp @@ -285,6 +304,8 @@ set(MBGL_CORE_FILES src/mbgl/style/source_observer.hpp src/mbgl/style/style.cpp src/mbgl/style/style.hpp + src/mbgl/style/style.hpp + src/mbgl/style/style.hpp src/mbgl/style/tile_source_impl.cpp src/mbgl/style/tile_source_impl.hpp src/mbgl/style/types.cpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 02df6c4d67..9012ae9616 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -41,6 +41,9 @@ set(MBGL_TEST_FILES # programs test/programs/binary_program.test.cpp + # renderer + test/renderer/group_by_layout.test.cpp + # sprite test/sprite/sprite_atlas.test.cpp test/sprite/sprite_parser.test.cpp @@ -90,7 +93,6 @@ set(MBGL_TEST_FILES test/style/function/source_function.test.cpp # style - test/style/group_by_layout.test.cpp test/style/paint_property.test.cpp test/style/source.test.cpp test/style/style.test.cpp |