[core] remove gl/context.hpp from more files, cast where necessary

2 files changed, 9 insertions, 6 deletions

diff --git a/src/mbgl/gl/debugging.cpp b/src/mbgl/gl/debugging.cpp
index 7b8121f003..54cee5fc09 100644
--- a/src/mbgl/gl/debugging.cpp
+++ b/src/mbgl/gl/debugging.cpp
@@ -9,8 +9,8 @@ using namespace platform;
 
 #ifndef NDEBUG
 
-DebugGroup::DebugGroup(const Context& context_, const std::string& name) : context(context_) {
-    if (auto debugging = context.getDebuggingExtension()) {
+DebugGroup::DebugGroup(const gfx::Context& context_, const std::string& name) : context(context_) {
+    if (auto debugging = reinterpret_cast<const gl::Context&>(context).getDebuggingExtension()) {
         if (debugging->pushDebugGroup) {
             MBGL_CHECK_ERROR(debugging->pushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, GLsizei(name.size()), name.c_str()));
         } else if (debugging->pushGroupMarkerEXT) {
@@ -20,7 +20,7 @@ DebugGroup::DebugGroup(const Context& context_, const std::string& name) : conte
 }
 
 DebugGroup::~DebugGroup() {
-    if (auto debugging = context.getDebuggingExtension()) {
+    if (auto debugging = reinterpret_cast<const gl::Context&>(context).getDebuggingExtension()) {
         if (debugging->popDebugGroup) {
             MBGL_CHECK_ERROR(debugging->popDebugGroup());
         } else if (debugging->popGroupMarkerEXT) {
diff --git a/src/mbgl/gl/debugging.hpp b/src/mbgl/gl/debugging.hpp
index d24b727295..d85eb631be 100644
--- a/src/mbgl/gl/debugging.hpp
+++ b/src/mbgl/gl/debugging.hpp
@@ -5,19 +5,22 @@
 #include <string>
 
 namespace mbgl {
-namespace gl {
 
+namespace gfx {
 class Context;
+} // namespace gfx
+
+namespace gl {
 
 #ifndef NDEBUG
 
 class DebugGroup : private util::noncopyable {
 public:
-    DebugGroup(const Context&, const std::string&);
+    DebugGroup(const gfx::Context&, const std::string&);
     ~DebugGroup();
 
 private:
-    const Context& context;
+    const gfx::Context& context;
 };
 
 #define __MBGL_DEBUG_GROUP_NAME2(counter) __MBGL_DEBUG_GROUP_##counter