Clear VAO binding before binding index buffer.

Fixes issue #5620.
mapbox · Nov 8, 2017 · df1b00b · df1b00b
1 parent 3f419f3
commit df1b00b
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/gl/index_buffer.js b/src/gl/index_buffer.js
@@ -15,15 +15,7 @@ class IndexBuffer {
         this.buffer = gl.createBuffer();
         this.dynamicDraw = Boolean(dynamicDraw);
 
-        // The bound index buffer is part of vertex array object state. We don't want to
-        // modify whatever VAO happens to be currently bound, so make sure the default
-        // vertex array provided by the context is bound instead.
-        if (gl.extVertexArrayObject === undefined) {
-            (gl: any).extVertexArrayObject = gl.getExtension("OES_vertex_array_object");
-        }
-        if (gl.extVertexArrayObject) {
-            (gl: any).extVertexArrayObject.bindVertexArrayOES(null);
-        }
+        this.unbindVAO();
 
         gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.buffer);
         gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, array.arrayBuffer, this.dynamicDraw ? gl.DYNAMIC_DRAW : gl.STATIC_DRAW);
@@ -33,12 +25,27 @@ class IndexBuffer {
         }
     }
 
+    unbindVAO() {
+        // The bound index buffer is part of vertex array object state. We don't want to
+        // modify whatever VAO happens to be currently bound, so make sure the default
+        // vertex array provided by the context is bound instead.
+        if (this.gl.extVertexArrayObject === undefined) {
+            (this.gl: any).extVertexArrayObject = this.gl.getExtension("OES_vertex_array_object");
+        }
+        if (this.gl.extVertexArrayObject) {
+            (this.gl: any).extVertexArrayObject.bindVertexArrayOES(null);
+        }
+    }
+
     bind() {
         this.gl.bindBuffer(this.gl.ELEMENT_ARRAY_BUFFER, this.buffer);
     }
 
     updateData(array: SerializedStructArray) {
         assert(this.dynamicDraw);
+        // The right VAO will get this buffer re-bound later in VertexArrayObject#bind
+        // See https://github.com/mapbox/mapbox-gl-js/issues/5620
+        this.unbindVAO();
         this.bind();
         this.gl.bufferSubData(this.gl.ELEMENT_ARRAY_BUFFER, 0, array.arrayBuffer);
     }