diff --git a/js/data/bucket/line_bucket.js b/js/data/bucket/line_bucket.js index 3066a08206f..8a2ce2e8323 100644 --- a/js/data/bucket/line_bucket.js +++ b/js/data/bucket/line_bucket.js @@ -48,7 +48,6 @@ const lineInterface = { {property: 'line-color', type: 'Uint8'}, {property: 'line-blur', multiplier: 10, type: 'Uint8'}, {property: 'line-opacity', multiplier: 10, type: 'Uint8'}, - {property: 'line-width', multiplier: 10, type: 'Uint8'}, {property: 'line-gap-width', multiplier: 10, type: 'Uint8', name: 'a_gapwidth'}, {property: 'line-offset', multiplier: 1, type: 'Int8'}, ], diff --git a/js/render/draw_line.js b/js/render/draw_line.js index ae67dd40ea7..a813750fd6e 100644 --- a/js/render/draw_line.js +++ b/js/render/draw_line.js @@ -104,7 +104,7 @@ function drawLineTile(program, painter, tile, buffers, layer, coord, layerData, gl.uniform2fv(program.u_pattern_br_b, imagePosB.br); gl.uniform1f(program.u_fade, image.t); } - + gl.uniform1f(program.u_width, layer.paint['line-width']); gl.uniformMatrix2fv(program.u_antialiasingmatrix, false, painter.transform.lineAntialiasingMatrix); gl.uniform1f(program.u_extra, painter.transform.lineStretch); diff --git a/package.json b/package.json index 9e81f3119b6..a06ba0df82b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "geojson-vt": "^2.4.0", "grid-index": "^1.0.0", "mapbox-gl-function": "mapbox/mapbox-gl-function#41c6724e2bbd7bd1eb5991451bbf118b7d02b525", - "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#26733535ba2f1b164dd6a231d4d1868c3218eafd", + "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#94518afb141b376e7f86e492c1b022c0159ca4a3", "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#e85407a377510acb647161de6be6357ab4f606dd", "mapbox-gl-supported": "^1.2.0", "package-json-versionify": "^1.0.2", @@ -62,7 +62,7 @@ "in-publish": "^2.0.0", "jsdom": "^9.4.2", "lodash.template": "^4.4.0", - "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#623745e501a90a12cb5c750f3f8276cdf5c88bc4", + "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#178f0789feb6011bba5965b75913e883a8615464", "minifyify": "^7.0.1", "npm-run-all": "^3.0.0", "nyc": "^8.3.0",