[core] always set activeTexture before binding a texture

2 files changed, 4 insertions, 0 deletions

diff --git a/src/mbgl/gl/gl_config.cpp b/src/mbgl/gl/gl_config.cpp
index 4160ae100e..ecf987876c 100644
--- a/src/mbgl/gl/gl_config.cpp
+++ b/src/mbgl/gl/gl_config.cpp
@@ -19,6 +19,7 @@ const ClearColor::Type ClearColor::Default = { 0, 0, 0, 0 };
 const ClearStencil::Type ClearStencil::Default = 0;
 const Program::Type Program::Default = 0;
 const LineWidth::Type LineWidth::Default = 1;
+const ActiveTexture::Type ActiveTexture::Default = GL_TEXTURE0;
 
 } // namespace gl
 } // namespace mbgl
diff --git a/src/mbgl/gl/gl_config.hpp b/src/mbgl/gl/gl_config.hpp
index af373fc3f8..8ec191daf7 100644
--- a/src/mbgl/gl/gl_config.hpp
+++ b/src/mbgl/gl/gl_config.hpp
@@ -55,6 +55,7 @@ public:
         clearStencil.reset();
         program.reset();
         lineWidth.reset();
+        activeTexture.reset();
     }
 
     void setDirty() {
@@ -74,6 +75,7 @@ public:
         clearStencil.setDirty();
         program.setDirty();
         lineWidth.setDirty();
+        activeTexture.setDirty();
     }
 
     Value<StencilFunc> stencilFunc;
@@ -92,6 +94,7 @@ public:
     Value<ClearStencil> clearStencil;
     Value<Program> program;
     Value<LineWidth> lineWidth;
+    Value<ActiveTexture> activeTexture;
 };
 
 } // namespace gl