Take a number, not elementGroups, as an argument to setAttribPointers…

… (SQUASH ME)
mapbox · Mar 3, 2016 · c9b0d8f · c9b0d8f
1 parent 6d5f228
commit c9b0d8f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/js/data/bucket.js b/js/data/bucket.js
@@ -227,7 +227,7 @@ Bucket.prototype.isAttributeDisabled = function(attribute) {
  * @param {number} offset The offset of the attribute data in the currently bound GL buffer.
  * @param {Array} arguments to be passed to disabled attribute value functions
  */
-Bucket.prototype.setAttribPointers = function(shaderName, gl, shader, group, args) {
+Bucket.prototype.setAttribPointers = function(shaderName, gl, shader, vertexOffset, args) {
     // Set disabled attributes
     var disabledAttributes = this.getAttributes(shaderName, {isDisabled: true});
     for (var i = 0; i < disabledAttributes.length; i++) {
@@ -243,7 +243,7 @@ Bucket.prototype.setAttribPointers = function(shaderName, gl, shader, group, arg
     vertexBuffer.setAttribPointers(
         gl,
         shader,
-        group.vertexOffset,
+        vertexOffset,
         util.mapObjectKV(enabledAttributes, function(attribute) {
             return [attribute.name, 'a_' + attribute.name];
         })

diff --git a/js/render/draw_circle.js b/js/render/draw_circle.js
@@ -53,7 +53,7 @@ function drawCircles(painter, source, layer, coords) {
         for (var k = 0; k < elementGroups.length; k++) {
             var group = elementGroups[k];
 
-            bucket.setAttribPointers('circle', gl, shader, group, [{$zoom: painter.transform.zoom}]);
+            bucket.setAttribPointers('circle', gl, shader, group.vertexOffset, [{$zoom: painter.transform.zoom}]);
 
             var count = group.elementLength * 3;
             gl.drawElements(gl.TRIANGLES, count, gl.UNSIGNED_SHORT, group.elementOffset);

diff --git a/js/render/draw_collision_debug.js b/js/render/draw_collision_debug.js
@@ -20,7 +20,7 @@ function drawCollisionDebug(painter, source, layer, coords) {
         if (elementGroups[0].vertexLength === 0) continue;
 
         bucket.bindBuffers('collisionBox', gl);
-        bucket.setAttribPointers('collisionBox', gl, shader, elementGroups[0]);
+        bucket.setAttribPointers('collisionBox', gl, shader, elementGroups[0].vertexOffset);
 
         var posMatrix = painter.calculatePosMatrix(coord, source.maxzoom);
         gl.setPosMatrix(posMatrix);

diff --git a/js/render/draw_fill.js b/js/render/draw_fill.js
@@ -99,7 +99,7 @@ function drawFill(painter, source, layer, coord) {
 
     for (var i = 0; i < elementGroups.length; i++) {
         var group = elementGroups[i];
-        bucket.setAttribPointers('fill', gl, painter.fillShader, group);
+        bucket.setAttribPointers('fill', gl, painter.fillShader, group.vertexOffset);
 
         var count = group.elementLength * 3;
         gl.drawElements(gl.TRIANGLES, count, gl.UNSIGNED_SHORT, group.elementOffset);
@@ -202,7 +202,7 @@ function drawStroke(painter, source, layer, coord) {
 
     for (var k = 0; k < elementGroups.length; k++) {
         var group = elementGroups[k];
-        bucket.setAttribPointers('fill', gl, painter.outlineShader, group);
+        bucket.setAttribPointers('fill', gl, painter.outlineShader, group.vertexOffset);
 
         var count = group.secondElementLength * 2;
         gl.drawElements(gl.LINES, count, gl.UNSIGNED_SHORT, group.secondElementOffset);

diff --git a/js/render/draw_line.js b/js/render/draw_line.js
@@ -171,7 +171,7 @@ module.exports = function drawLine(painter, source, layer, coords) {
 
         for (var i = 0; i < elementGroups.length; i++) {
             var group = elementGroups[i];
-            bucket.setAttribPointers('line', gl, shader, group);
+            bucket.setAttribPointers('line', gl, shader, group.vertexOffset);
 
             var count = group.elementLength * 3;
             gl.drawElements(gl.TRIANGLES, count, gl.UNSIGNED_SHORT, group.elementOffset);

diff --git a/js/render/draw_symbol.js b/js/render/draw_symbol.js
@@ -168,7 +168,7 @@ function drawSymbol(painter, layer, posMatrix, tile, bucket, elementGroups, pref
 
             for (var j = 0; j < elementGroups.length; j++) {
                 group = elementGroups[j];
-                bucket.setAttribPointers(shaderInterfaceName, gl, shader, group);
+                bucket.setAttribPointers(shaderInterfaceName, gl, shader, group.vertexOffset);
 
                 count = group.elementLength * 3;
                 gl.drawElements(gl.TRIANGLES, count, gl.UNSIGNED_SHORT, group.elementOffset);
@@ -182,7 +182,7 @@ function drawSymbol(painter, layer, posMatrix, tile, bucket, elementGroups, pref
 
         for (var i = 0; i < elementGroups.length; i++) {
             group = elementGroups[i];
-            bucket.setAttribPointers(shaderInterfaceName, gl, shader, group);
+            bucket.setAttribPointers(shaderInterfaceName, gl, shader, group.vertexOffset);
 
             count = group.elementLength * 3;
             gl.drawElements(gl.TRIANGLES, count, gl.UNSIGNED_SHORT, group.elementOffset);
@@ -192,7 +192,7 @@ function drawSymbol(painter, layer, posMatrix, tile, bucket, elementGroups, pref
         gl.uniform1f(shader.u_opacity, layer.paint['icon-opacity']);
         for (var k = 0; k < elementGroups.length; k++) {
             group = elementGroups[k];
-            bucket.setAttribPointers(shaderInterfaceName, gl, shader, group);
+            bucket.setAttribPointers(shaderInterfaceName, gl, shader, group.vertexOffset);
 
             count = group.elementLength * 3;
             gl.drawElements(gl.TRIANGLES, count, gl.UNSIGNED_SHORT, group.elementOffset);