Merge pull request #3126 from lilleyse/vertexDivisorFix

Fixed divisor issue
CesiumGS · Oct 26, 2015 · c2649d8 · c2649d8
2 parents f5ed115 + 4d2bf7f
commit c2649d8
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/Source/Renderer/VertexArray.js b/Source/Renderer/VertexArray.js
@@ -93,10 +93,18 @@ define([
                 gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer._getBuffer());
                 gl.vertexAttribPointer(index, this.componentsPerAttribute, this.componentDatatype, this.normalize, this.strideInBytes, this.offsetInBytes);
                 gl.enableVertexAttribArray(index);
+                if (this.instanceDivisor > 0) {
+                    context.glVertexAttribDivisor(index, this.instanceDivisor);
+                    context._vertexAttribDivisors[index] = this.instanceDivisor;
+                    context._previousDrawInstanced = true;
+                }
             };
 
             attr.disableVertexAttribArray = function(gl) {
                 gl.disableVertexAttribArray(this.index);
+                if (this.instanceDivisor > 0) {
+                    context.glVertexAttribDivisor(index, 0);
+                }
             };
         } else {
             // Less common case: value array for the same data for each vertex
@@ -707,13 +715,12 @@ define([
     VertexArray.prototype._bind = function() {
         if (defined(this._vao)) {
             this._context.glBindVertexArray(this._vao);
+            if (this._context.instancedArrays) {
+                setVertexAttribDivisor(this);
+            }
         } else {
             bind(this._gl, this._attributes, this._indexBuffer);
         }
-
-        if (this._context.instancedArrays) {
-            setVertexAttribDivisor(this);
-        }
     };
 
     VertexArray.prototype._unBind = function() {