more rebasing, get tests to pass

mapbox · Nov 11, 2016 · 5c1a195 · 5c1a195
1 parent 0474103
commit 5c1a195
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/js/data/bucket/line_bucket.js b/js/data/bucket/line_bucket.js
@@ -45,7 +45,12 @@ const lineInterface = {
         {name: 'a_data', components: 4, type: 'Uint8'}
     ]),
     paintAttributes: [
-        {property: 'line-color', type: 'Uint8'}
+        {property: 'line-color', type: 'Uint8'},
+		{property: 'line-blur', type: 'Uint8'},
+		{property: 'line-opacity', type: 'Uint8'},
+		{property: 'line-width', type: 'Uint8'},
+		{property: 'line-gap-width', type: 'Uint8'},
+		{property: 'line-offset', type: 'Uint8'},
     ],
     elementArrayType: createElementArrayType()
 };

diff --git a/js/render/draw_line.js b/js/render/draw_line.js
@@ -108,17 +108,8 @@ function drawLineTile(program, painter, tile, buffers, layer, coord, layerData,
             gl.uniform1f(program.u_fade, image.t);
         }
 
-        // the distance over which the line edge fades out.
-        // Retina devices need a smaller distance to avoid aliasing.
-        const antialiasing = 1 / browser.devicePixelRatio;
-
-        gl.uniform1f(program.u_linewidth, layer.paint['line-width'] / 2);
-        gl.uniform1f(program.u_gapwidth, layer.paint['line-gap-width'] / 2);
-        gl.uniform1f(program.u_antialiasing, antialiasing / 2);
-        gl.uniform1f(program.u_blur, layer.paint['line-blur'] + antialiasing);
-        gl.uniform1f(program.u_opacity, layer.paint['line-opacity']);
+
         gl.uniformMatrix2fv(program.u_antialiasingmatrix, false, painter.transform.lineAntialiasingMatrix);
-        gl.uniform1f(program.u_offset, -layer.paint['line-offset']);
         gl.uniform1f(program.u_extra, painter.transform.lineStretch);
     }