Use shader source rewriting to disable attributes

fixes #1714
mapbox · Apr 6, 2016 · d60f64a · d60f64a
1 parent 75dc9f1
commit d60f64a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/js/data/bucket.js b/js/data/bucket.js
@@ -234,8 +234,8 @@ Bucket.prototype.setAttribPointers = function(programName, gl, program, offset,
         if (attribute.isLayerConstant === false && layer.id !== attribute.layerId) continue;
 
         var attributeId = program[attribute.programName];
-        gl.disableVertexAttribArray(attributeId);
-        gl['vertexAttrib' + attribute.components + 'fv'](attributeId, attribute.getValue.apply(this, args));
+        // NOCOMMIT change this to set uniforms instead of attribs
+        gl['uniform' + attribute.components + 'fv'](attributeId, attribute.getValue.apply(this, args));
     }
 
     // Set enabled attributes
@@ -337,6 +337,26 @@ Bucket.prototype.recalculateStyleLayers = function() {
     }
 };
 
+Bucket.prototype.getUseProgramTokens = function(programInterface, layer) {
+    var tokens = {};
+
+    var enabledAttributes = this.attributes[programInterface].enabled;
+    for (var i = 0; i < enabledAttributes.length; i++) {
+        var enabledAttribute = enabledAttributes[i];
+        if (enabledAttribute.isLayerConstant !== false && enabledAttribute.layerId !== layer.id) continue;
+        tokens[enabledAttribute.originalName + 'Type'] = 'attribute';
+    }
+
+    var disabledAttributes = this.attributes[programInterface].disabled;
+    for (var j = 0; j < this.attributes[programInterface].disabled.length; j++) {
+        var disabledAttribute = disabledAttributes[j];
+        if (disabledAttribute.isLayerConstant !== false && disabledAttribute.layerId !== layer.id) continue;
+        tokens[disabledAttribute.originalName + 'Type'] = 'uniform';
+    }
+
+    return tokens;
+};
+
 var createVertexAddMethodCache = {};
 function createVertexAddMethod(bucket, interfaceName) {
     var enabledAttributes = bucket.attributes[interfaceName].enabled;
@@ -450,14 +470,16 @@ function createAttributes(bucket) {
                         name: layer.id + '__' + attribute.name,
                         programName: 'a_' + attribute.name,
                         layerId: layer.id,
-                        layerIndex: j
+                        layerIndex: j,
+                        originalName: attribute.name
                     }));
                 } else {
                     interfaceAttributes.enabled.push(util.extend({}, attribute, {
                         name: layer.id + '__' + attribute.name,
                         programName: 'a_' + attribute.name,
                         layerId: layer.id,
-                        layerIndex: j
+                        layerIndex: j,
+                        originalName: attribute.name
                     }));
                 }
             }

diff --git a/js/render/draw_circle.js b/js/render/draw_circle.js
@@ -9,10 +9,6 @@ function drawCircles(painter, source, layer, coords) {
 
     var gl = painter.gl;
 
-    var program = painter.useProgram('circle', {
-        colorType: 'attribute'
-    });
-
     painter.setDepthSublayer(0);
     painter.depthMask(false);
 
@@ -26,9 +22,6 @@ function drawCircles(painter, source, layer, coords) {
     // are inversely related.
     var antialias = 1 / browser.devicePixelRatio / layer.paint['circle-radius'];
 
-    gl.uniform1f(program.u_blur, Math.max(layer.paint['circle-blur'], antialias));
-    gl.uniform1f(program.u_size, layer.paint['circle-radius']);
-
     for (var i = 0; i < coords.length; i++) {
         var coord = coords[i];
 
@@ -38,6 +31,11 @@ function drawCircles(painter, source, layer, coords) {
         var elementGroups = bucket.elementGroups.circle;
         if (!elementGroups) continue;
 
+        var program = painter.useProgram('circle', bucket.getUseProgramTokens('circle', layer));
+
+        gl.uniform1f(program.u_blur, Math.max(layer.paint['circle-blur'], antialias));
+        gl.uniform1f(program.u_size, layer.paint['circle-radius']);
+
         painter.setPosMatrix(painter.translatePosMatrix(
             coord.posMatrix,
             tile,
@@ -54,6 +52,4 @@ function drawCircles(painter, source, layer, coords) {
             gl.drawElements(gl.TRIANGLES, count, gl.UNSIGNED_SHORT, group.elementOffset);
         }
     }
-
-    gl.enableVertexAttribArray(program.a_color);
 }