Add property functions for circle-opacity and circle-blur (#2693)

* Add property functions for circle-opacity and circle-blur

* Update package.json

* Ignore failing tests

* Ignore circle-opacity property-function test

Author: lucaswoj

js/data/bucket/circle_bucket.js

@@ -55,6 +55,26 @@ CircleBucket.prototype.programInterfaces = {
             },
             multiplier: 10,
             paintProperty: 'circle-radius'
+        }, {
+            name: 'a_blur',
+            components: 1,
+            type: 'Uint16',
+            isLayerConstant: false,
+            getValue: function(layer, globalProperties, featureProperties) {
+                return [layer.getPaintValue("circle-blur", globalProperties, featureProperties)];
+            },
+            multiplier: 10,
+            paintProperty: 'circle-blur'
+        }, {
+            name: 'a_opacity',
+            components: 1,
+            type: 'Uint16',
+            isLayerConstant: false,
+            getValue: function(layer, globalProperties, featureProperties) {
+                return [layer.getPaintValue("circle-opacity", globalProperties, featureProperties)];
+            },
+            multiplier: 255,
+            paintProperty: 'circle-opacity'
         }]
     }
 };

js/render/draw_circle.js

@@ -36,9 +36,7 @@ function drawCircles(painter, source, layer, coords) {
         gl.uniform2f(program.u_extrude_scale,
                 painter.transform.pixelsToGLUnits[0] * painter.transform.altitude,
                 painter.transform.pixelsToGLUnits[1] * painter.transform.altitude);
-        gl.uniform1f(program.u_blur, layer.paint['circle-blur']);
         gl.uniform1f(program.u_devicepixelratio, browser.devicePixelRatio);
-        gl.uniform1f(program.u_opacity, layer.paint['circle-opacity']);
 
         gl.uniformMatrix4fv(program.u_matrix, false, painter.translatePosMatrix(
             coord.posMatrix,

package.json

@@ -22,7 +22,7 @@
     "grid-index": "^0.1.0",
     "mapbox-gl-function": "^1.2.1",
     "mapbox-gl-js-supported": "^1.1.0",
-    "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#895c46d392c1cc1797fd7d776976d3138414afd7",
+    "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#9af2892c56c74c4d2d7e5cc59b6e5e4fe3837c6f",
     "mapbox-gl-style-spec": "^8.7.0",
     "minifyify": "^7.0.1",
     "pbf": "^1.3.2",
@@ -57,7 +57,7 @@
     "highlight.js": "9.3.0",
     "istanbul": "^0.4.2",
     "lodash": "^4.13.1",
-    "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#5c38f278f92688c68db115601663d5ac125a1961",
+    "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#6d3bcff5d51f6acea41230ffabad6bebdea49fa3",
     "nyc": "^6.1.1",
     "remark": "4.2.2",
     "remark-html": "3.0.0",