[core] move GL value accessors to gl::value namespace

2 files changed, 4 insertions, 6 deletions

diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 438e4b5e47..2b3189cc55 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -48,8 +48,8 @@ Painter::Painter(const TransformState& state_,
 #endif
 
     // Reset GL values
-    config.setDirty();
-    config.reset();
+    config.setDirtyState();
+    config.resetState();
 }
 
 Painter::~Painter() = default;
@@ -225,7 +225,7 @@ void Painter::render(const Style& style, const FrameData& frame_, SpriteAtlas& a
     }
 
     if (frame.contextMode == GLContextMode::Shared) {
-        config.setDirty();
+        config.setDirtyState();
     }
 }
 
@@ -276,7 +276,7 @@ void Painter::renderPass(PaintParameters& parameters,
             config.stencilTest = GL_FALSE;
             setDepthSublayer(0);
             layer.as<CustomLayer>()->impl->render(state);
-            config.setDirty();
+            config.setDirtyState();
             config.bindFramebuffer.reset();
             config.viewport.reset();
         } else {
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index 8c15070cd5..adecc20518 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -6,8 +6,6 @@
 #include <mbgl/util/string.hpp>
 #include <mbgl/gl/debugging.hpp>
 #include <mbgl/gl/gl.hpp>
-#include <mbgl/gl/gl_values.hpp>
-#include <mbgl/gl/gl_helper.hpp>
 #include <mbgl/util/color.hpp>
 
 namespace mbgl {