summaryrefslogtreecommitdiff
path: root/test/api
diff options
context:
space:
mode:
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com>2019-05-21 07:37:49 +0300
committerGitHub <noreply@github.com>2019-05-21 07:37:49 +0300
commit3cd8c6c1fda6c7691e0a71b6ef7a393ea0e50108 (patch)
tree99b4d40a6697d6a3b2ba5b45a68f5f0aee94855b /test/api
parent88ef7d89c46b4c4e6e8ad84a5c8e9f410ef6d3cb (diff)
downloadqtlocation-mapboxgl-3cd8c6c1fda6c7691e0a71b6ef7a393ea0e50108.tar.gz
[core] Refactor HeadlessFrontend/Backend: GL separation and factory (#14692)
Refactor out HeadlessFrontend and HeadlessBackend gl independent code to gfx. Define gl::HeadlessBackend as subclass, instantiated by gfx::HeadlessBackend static factory method. GL dependent tests are still using gl::HeadlessBackend directly (not through gfx).
Diffstat (limited to 'test/api')
-rw-r--r--test/api/annotations.test.cpp2
-rw-r--r--test/api/api_misuse.test.cpp2
-rw-r--r--test/api/custom_geometry_source.test.cpp2
-rw-r--r--test/api/custom_layer.test.cpp2
-rw-r--r--test/api/query.test.cpp2
-rw-r--r--test/api/recycle_map.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp
index 2d76a3d154..d7cb572cb0 100644
--- a/test/api/annotations.test.cpp
+++ b/test/api/annotations.test.cpp
@@ -10,7 +10,7 @@
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/color.hpp>
#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/gl/headless_frontend.hpp>
+#include <mbgl/gfx/headless_frontend.hpp>
using namespace mbgl;
diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp
index 54d8eb5912..aeb0e4864a 100644
--- a/test/api/api_misuse.test.cpp
+++ b/test/api/api_misuse.test.cpp
@@ -5,7 +5,7 @@
#include <mbgl/map/map_options.hpp>
#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/gl/headless_frontend.hpp>
+#include <mbgl/gfx/headless_frontend.hpp>
#include <mbgl/util/exception.hpp>
#include <mbgl/util/run_loop.hpp>
diff --git a/test/api/custom_geometry_source.test.cpp b/test/api/custom_geometry_source.test.cpp
index df65dc2703..f35b4d335c 100644
--- a/test/api/custom_geometry_source.test.cpp
+++ b/test/api/custom_geometry_source.test.cpp
@@ -2,7 +2,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/map/map_options.hpp>
-#include <mbgl/gl/headless_frontend.hpp>
+#include <mbgl/gfx/headless_frontend.hpp>
#include <mbgl/storage/resource_options.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/sources/custom_geometry_source.hpp>
diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp
index e9b9aee9bc..5afc4152ba 100644
--- a/test/api/custom_layer.test.cpp
+++ b/test/api/custom_layer.test.cpp
@@ -4,7 +4,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/map/map_options.hpp>
#include <mbgl/gl/defines.hpp>
-#include <mbgl/gl/headless_frontend.hpp>
+#include <mbgl/gfx/headless_frontend.hpp>
#include <mbgl/storage/resource_options.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/layers/custom_layer.hpp>
diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp
index b80d3b7d8a..bf3f64a0c8 100644
--- a/test/api/query.test.cpp
+++ b/test/api/query.test.cpp
@@ -13,7 +13,7 @@
#include <mbgl/style/sources/geojson_source.hpp>
#include <mbgl/style/expression/dsl.hpp>
#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/gl/headless_frontend.hpp>
+#include <mbgl/gfx/headless_frontend.hpp>
using namespace mbgl;
using namespace mbgl::style;
diff --git a/test/api/recycle_map.cpp b/test/api/recycle_map.cpp
index 55e19e3cd9..b3c573b1a2 100644
--- a/test/api/recycle_map.cpp
+++ b/test/api/recycle_map.cpp
@@ -2,7 +2,7 @@
#include <mbgl/test/stub_file_source.hpp>
#include <mbgl/test/map_adapter.hpp>
-#include <mbgl/gl/headless_frontend.hpp>
+#include <mbgl/gfx/headless_frontend.hpp>
#include <mbgl/map/map_options.hpp>
#include <mbgl/gfx/backend_scope.hpp>
#include <mbgl/style/layers/symbol_layer.hpp>