diff options
| author | Thomas Moenicke <thomas.moenicke@mapbox.com> | 2020-02-03 19:10:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 19:10:57 +0200 |
| commit | b64ed754442b894f3914a4191798fbd2f2bc8cd9 (patch) | |
| tree | 59bb14829d7cdd5f2466dad4cffb74c4d1b80068 /test | |
| parent | 2e10d3548a8b3aff1f28b9514594c3c14509f084 (diff) | |
| download | qtlocation-mapboxgl-b64ed754442b894f3914a4191798fbd2f2bc8cd9.tar.gz | |
[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
Diffstat (limited to 'test')
| -rw-r--r-- | test/api/custom_layer.test.cpp | 10 | ||||
| -rw-r--r-- | test/gl/context.test.cpp | 16 | ||||
| -rw-r--r-- | test/style/style_layer.test.cpp | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp index 2222645147..2cfa7bf400 100644 --- a/test/api/custom_layer.test.cpp +++ b/test/api/custom_layer.test.cpp @@ -1,14 +1,14 @@ #include <mbgl/test/util.hpp> -#include <mbgl/platform/gl_functions.hpp> +#include <mbgl/gfx/headless_frontend.hpp> +#include <mbgl/gl/custom_layer.hpp> +#include <mbgl/gl/defines.hpp> #include <mbgl/map/map.hpp> #include <mbgl/map/map_options.hpp> -#include <mbgl/gl/defines.hpp> -#include <mbgl/gfx/headless_frontend.hpp> +#include <mbgl/platform/gl_functions.hpp> #include <mbgl/storage/resource_options.hpp> -#include <mbgl/style/style.hpp> -#include <mbgl/style/layers/custom_layer.hpp> #include <mbgl/style/layers/fill_layer.hpp> +#include <mbgl/style/style.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/mat4.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/test/gl/context.test.cpp b/test/gl/context.test.cpp index 9c709b7597..2135ed9862 100644 --- a/test/gl/context.test.cpp +++ b/test/gl/context.test.cpp @@ -1,18 +1,18 @@ #include <mbgl/test/util.hpp> -#include <mbgl/platform/gl_functions.hpp> -#include <mbgl/gl/context.hpp> -#include <mbgl/map/map.hpp> -#include <mbgl/map/map_options.hpp> #include <mbgl/gfx/backend_scope.hpp> -#include <mbgl/gl/defines.hpp> #include <mbgl/gfx/headless_frontend.hpp> +#include <mbgl/gl/context.hpp> +#include <mbgl/gl/custom_layer.hpp> +#include <mbgl/gl/defines.hpp> #include <mbgl/gl/renderable_resource.hpp> +#include <mbgl/map/map.hpp> +#include <mbgl/map/map_options.hpp> +#include <mbgl/platform/gl_functions.hpp> #include <mbgl/storage/resource_options.hpp> -#include <mbgl/style/style.hpp> -#include <mbgl/style/layers/custom_layer.hpp> -#include <mbgl/style/layers/fill_layer.hpp> #include <mbgl/style/layers/background_layer.hpp> +#include <mbgl/style/layers/fill_layer.hpp> +#include <mbgl/style/style.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/mat4.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/test/style/style_layer.test.cpp b/test/style/style_layer.test.cpp index 77e936ff3b..33573636d7 100644 --- a/test/style/style_layer.test.cpp +++ b/test/style/style_layer.test.cpp @@ -1,3 +1,5 @@ +#include <mbgl/gl/custom_layer.hpp> +#include <mbgl/gl/custom_layer_impl.hpp> #include <mbgl/style/expression/dsl.hpp> #include <mbgl/style/expression/format_expression.hpp> #include <mbgl/style/expression/image.hpp> @@ -6,8 +8,6 @@ #include <mbgl/style/layers/background_layer_impl.hpp> #include <mbgl/style/layers/circle_layer.hpp> #include <mbgl/style/layers/circle_layer_impl.hpp> -#include <mbgl/style/layers/custom_layer.hpp> -#include <mbgl/style/layers/custom_layer_impl.hpp> #include <mbgl/style/layers/fill_layer.hpp> #include <mbgl/style/layers/fill_layer_impl.hpp> #include <mbgl/style/layers/line_layer.hpp> |