Merge pull request #3113 from lilleyse/vertexDivisorFix

Fix globe texture stretching when instancing is enabled.
CesiumGS · Oct 21, 2015 · 3b250dc · 3b250dc
2 parents 3021bfa + 4ecbbbe
commit 3b250dc
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/Source/Renderer/VertexArray.js b/Source/Renderer/VertexArray.js
@@ -93,16 +93,10 @@ 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);
-                }
             };
 
             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
@@ -672,7 +666,8 @@ define([
 
     // Workaround for ANGLE, where the attribute divisor seems to be part of the global state instead
     // of the VAO state. This function is called when the vao is bound, and should be removed
-    // once the ANGLE issue is resolved.
+    // once the ANGLE issue is resolved. Setting the divisor should normally happen in vertexAttrib and
+    // disableVertexAttribArray.
     function setVertexAttribDivisor(vertexArray) {
         var context = vertexArray._context;
         var hasInstancedAttributes = vertexArray._hasInstancedAttributes;
@@ -712,12 +707,13 @@ 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() {