5 files changed, 19 insertions, 17 deletions
diff --git a/src/mbgl/renderer/backend_scope.cpp b/src/mbgl/renderer/backend_scope.cpp
index ad430961aa..e4988a37c2 100644
--- a/src/mbgl/renderer/backend_scope.cpp
+++ b/src/mbgl/renderer/backend_scope.cpp
@@ -1,13 +1,13 @@
-#include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/renderer/renderer_backend.hpp>
+#include <mbgl/gfx/backend_scope.hpp>
 #include <mbgl/util/thread_local.hpp>
 
 #include <cassert>
 
 namespace {
 
-mbgl::util::ThreadLocal<mbgl::BackendScope>& currentScope() {
-    static mbgl::util::ThreadLocal<mbgl::BackendScope> backendScope;
+mbgl::util::ThreadLocal<mbgl::gfx::BackendScope>& currentScope() {
+    static mbgl::util::ThreadLocal<mbgl::gfx::BackendScope> backendScope;
 
     return backendScope;
 }
@@ -15,6 +15,7 @@ mbgl::util::ThreadLocal<mbgl::BackendScope>& currentScope() {
 } // namespace
 
 namespace mbgl {
+namespace gfx {
 
 BackendScope::BackendScope(RendererBackend& backend_, ScopeType scopeType_)
     : priorScope(currentScope().get()),
@@ -71,4 +72,5 @@ bool BackendScope::exists() {
     return currentScope().get();
 }
 
+} // namespace gfx
 } // namespace mbgl
diff --git a/src/mbgl/renderer/layers/render_custom_layer.cpp b/src/mbgl/renderer/layers/render_custom_layer.cpp
index 10cc375585..240aef84ce 100644
--- a/src/mbgl/renderer/layers/render_custom_layer.cpp
+++ b/src/mbgl/renderer/layers/render_custom_layer.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/renderer/layers/render_custom_layer.hpp>
 #include <mbgl/renderer/paint_parameters.hpp>
-#include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/renderer/renderer_backend.hpp>
+#include <mbgl/gfx/backend_scope.hpp>
 #include <mbgl/renderer/bucket.hpp>
 #include <mbgl/platform/gl_functions.hpp>
 #include <mbgl/style/layers/custom_layer_impl.hpp>
@@ -15,12 +15,12 @@ using namespace style;
 
 RenderCustomLayer::RenderCustomLayer(Immutable<style::CustomLayer::Impl> _impl)
     : RenderLayer(std::move(_impl)), host(impl().host) {
-    assert(BackendScope::exists());
+    assert(gfx::BackendScope::exists());
     MBGL_CHECK_ERROR(host->initialize());
 }
 
 RenderCustomLayer::~RenderCustomLayer() {
-    assert(BackendScope::exists());
+    assert(gfx::BackendScope::exists());
     if (contextDestroyed) {
         host->contextLost();
     } else {
diff --git a/src/mbgl/renderer/renderer.cpp b/src/mbgl/renderer/renderer.cpp
index 4da7b78374..a345ed6e12 100644
--- a/src/mbgl/renderer/renderer.cpp
+++ b/src/mbgl/renderer/renderer.cpp
@@ -2,7 +2,7 @@
 
 #include <mbgl/layermanager/layer_manager.hpp>
 #include <mbgl/renderer/renderer_impl.hpp>
-#include <mbgl/renderer/backend_scope.hpp>
+#include <mbgl/gfx/backend_scope.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 
 namespace mbgl {
@@ -18,7 +18,7 @@ Renderer::Renderer(RendererBackend& backend,
 }
 
 Renderer::~Renderer() {
-    BackendScope guard { impl->backend };
+    gfx::BackendScope guard { impl->backend };
     impl.reset();
 }
 
@@ -116,7 +116,7 @@ void Renderer::dumpDebugLogs() {
 }
 
 void Renderer::reduceMemoryUse() {
-    BackendScope guard { impl->backend };
+    gfx::BackendScope guard { impl->backend };
     impl->reduceMemoryUse();
 }
 
diff --git a/src/mbgl/renderer/renderer_backend.cpp b/src/mbgl/renderer/renderer_backend.cpp
index d44386db55..24249e06a4 100644
--- a/src/mbgl/renderer/renderer_backend.cpp
+++ b/src/mbgl/renderer/renderer_backend.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/renderer/renderer_backend.hpp>
-#include <mbgl/renderer/backend_scope.hpp>
+#include <mbgl/gfx/backend_scope.hpp>
 #include <mbgl/gl/context.hpp>
 #include <mbgl/gl/extension.hpp>
 
@@ -10,7 +10,7 @@ namespace mbgl {
 RendererBackend::RendererBackend() = default;
 
 gl::Context& RendererBackend::getContext() {
-    assert(BackendScope::exists());
+    assert(gfx::BackendScope::exists());
     std::call_once(initialized, [this] {
         context = std::make_unique<gl::Context>();
         context->enableDebugging();
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index da051d61d9..3a85928cc3 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -14,7 +14,7 @@
 #include <mbgl/renderer/render_tile.hpp>
 #include <mbgl/renderer/style_diff.hpp>
 #include <mbgl/renderer/query.hpp>
-#include <mbgl/renderer/backend_scope.hpp>
+#include <mbgl/gfx/backend_scope.hpp>
 #include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/gl/context.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
@@ -56,7 +56,7 @@ Renderer::Impl::Impl(RendererBackend& backend_,
     , placement(std::make_unique<Placement>(TransformState{}, MapMode::Static, TransitionOptions{}, true)) {}
 
 Renderer::Impl::~Impl() {
-    assert(BackendScope::exists());
+    assert(gfx::BackendScope::exists());
 
     if (contextLost) {
         // Signal all RenderLayers that the context was lost
@@ -89,8 +89,8 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
         // Reset zoom history state.
         zoomHistory.first = true;
     }
-    
-    assert(BackendScope::exists());
+
+    assert(gfx::BackendScope::exists());
     if (LayerManager::annotationsEnabled) {
         updateParameters.annotationManager.updateData();
     }
@@ -598,7 +598,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
 }
 
 void  Renderer::Impl::flush() {
-    assert(BackendScope::exists());
+    assert(gfx::BackendScope::exists());
 
     backend.getContext().flush();
 }
@@ -728,7 +728,7 @@ FeatureExtensionValue Renderer::Impl::queryFeatureExtensions(const std::string&
 }
 
 void Renderer::Impl::reduceMemoryUse() {
-    assert(BackendScope::exists());
+    assert(gfx::BackendScope::exists());
     for (const auto& entry : renderSources) {
         entry.second->reduceMemoryUse();
     }