diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-01 15:57:44 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-04-05 11:49:17 +0200 |
| commit | a782a6d15b80dd83105604f3f779f6c83ba222e5 (patch) | |
| tree | 62d83196baf28554cdd3144691b8210cc998af4a /test/gl | |
| parent | 865f8a6c03540e329ed6caef354799fb58b7ab6e (diff) | |
| download | qtlocation-mapboxgl-a782a6d15b80dd83105604f3f779f6c83ba222e5.tar.gz | |
[core] move BackendScope to gfx namespace
Diffstat (limited to 'test/gl')
| -rw-r--r-- | test/gl/bucket.test.cpp | 12 | ||||
| -rw-r--r-- | test/gl/context.test.cpp | 3 | ||||
| -rw-r--r-- | test/gl/object.test.cpp | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp index 2be224382a..48cdc1c0f5 100644 --- a/test/gl/bucket.test.cpp +++ b/test/gl/bucket.test.cpp @@ -1,7 +1,7 @@ #include <mbgl/test/util.hpp> #include <mbgl/test/stub_geometry_tile_feature.hpp> -#include <mbgl/renderer/backend_scope.hpp> +#include <mbgl/gfx/backend_scope.hpp> #include <mbgl/renderer/buckets/circle_bucket.hpp> #include <mbgl/renderer/buckets/fill_bucket.hpp> #include <mbgl/renderer/buckets/line_bucket.hpp> @@ -44,7 +44,7 @@ PropertyMap properties; TEST(Buckets, CircleBucket) { HeadlessBackend backend({ 512, 256 }); - BackendScope scope { backend }; + gfx::BackendScope scope { backend }; gl::Context context; CircleBucket bucket { { {0, 0, 0}, MapMode::Static, 1.0, nullptr }, {} }; @@ -63,7 +63,7 @@ TEST(Buckets, CircleBucket) { TEST(Buckets, FillBucket) { HeadlessBackend backend({ 512, 256 }); - BackendScope scope { backend }; + gfx::BackendScope scope { backend }; style::Properties<>::PossiblyEvaluated layout; gl::Context context; @@ -82,7 +82,7 @@ TEST(Buckets, FillBucket) { TEST(Buckets, LineBucket) { HeadlessBackend backend({ 512, 256 }); - BackendScope scope { backend }; + gfx::BackendScope scope { backend }; style::LineLayoutProperties::PossiblyEvaluated layout; gl::Context context; @@ -106,7 +106,7 @@ TEST(Buckets, LineBucket) { TEST(Buckets, SymbolBucket) { HeadlessBackend backend({ 512, 256 }); - BackendScope scope { backend }; + gfx::BackendScope scope { backend }; style::SymbolLayoutProperties::PossiblyEvaluated layout; bool sdfIcons = false; @@ -140,7 +140,7 @@ TEST(Buckets, SymbolBucket) { TEST(Buckets, RasterBucket) { HeadlessBackend backend({ 512, 256 }); - BackendScope scope { backend }; + gfx::BackendScope scope { backend }; gl::Context context; PremultipliedImage rgba({ 1, 1 }); diff --git a/test/gl/context.test.cpp b/test/gl/context.test.cpp index 291813bd9a..14f7cd3a13 100644 --- a/test/gl/context.test.cpp +++ b/test/gl/context.test.cpp @@ -5,6 +5,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/map/map_options.hpp> #include <mbgl/util/default_thread_pool.hpp> +#include <mbgl/gfx/backend_scope.hpp> #include <mbgl/gl/defines.hpp> #include <mbgl/gl/headless_frontend.hpp> #include <mbgl/storage/resource_options.hpp> @@ -103,8 +104,8 @@ TEST(GLContextMode, Shared) { { // Custom rendering outside of GL Native render loop. - BackendScope scope { *frontend.getBackend() }; frontend.getBackend()->bind(); + gfx::BackendScope scope { *frontend.getBackend() }; Shader paintShader(vertexShaderSource, fragmentShaderSource); Buffer triangleBuffer({ 0, 0.5, 0.5, -0.5, -0.5, -0.5 }); diff --git a/test/gl/object.test.cpp b/test/gl/object.test.cpp index a29b2ff958..5441c4c335 100644 --- a/test/gl/object.test.cpp +++ b/test/gl/object.test.cpp @@ -1,6 +1,6 @@ #include <mbgl/test/util.hpp> -#include <mbgl/renderer/backend_scope.hpp> +#include <mbgl/gfx/backend_scope.hpp> #include <mbgl/gl/headless_backend.hpp> #include <mbgl/gl/context.hpp> @@ -46,7 +46,7 @@ TEST(GLObject, Value) { TEST(GLObject, Store) { HeadlessBackend backend { { 256, 256 } }; - BackendScope scope { backend }; + gfx::BackendScope scope { backend }; gl::Context context; EXPECT_TRUE(context.empty()); |