Unbind VAO before binding a GL_ELEMENT_ARRAY_BUFFER.

Fixes the native equivalent of gl-js issue #5620.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp
index b4be982be4..69b54c6e71 100644
--- a/src/mbgl/gl/context.cpp
+++ b/src/mbgl/gl/context.cpp
@@ -237,6 +237,9 @@ UniqueBuffer Context::createIndexBuffer(const void* data, std::size_t size, cons
 }
 
 void Context::updateIndexBuffer(UniqueBuffer& buffer, const void* data, std::size_t size) {
+    // Be sure to unbind any existing vertex array object before binding the index buffer
+    // so that we don't mess up another VAO
+    bindVertexArray = 0;
     globalVertexArrayState.indexBuffer = buffer;
     MBGL_CHECK_ERROR(glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, size, data));
 }