Skip to content

Commit

Permalink
Fix line drawing
Browse files Browse the repository at this point in the history
  • Loading branch information
Lauren Budorick authored and Anand Thakker committed Aug 6, 2018
1 parent c8b20a5 commit 345070e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/render/draw_line.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ export default function drawLine(painter: Painter, sourceCache: SourceCache, lay
const program = painter.useProgram(programId, programConfiguration);
const programChanged = firstTile || program.program !== prevProgram;

const uniformValues = dasharray ? lineSDFUniformValues(painter, tile, layer, dasharray) :
image ? linePatternUniformValues(painter, tile, layer, image) :
gradient ? lineGradientUniformValues(painter, tile, layer) :
lineUniformValues(painter, tile, layer);

if (dasharray && (programChanged || painter.lineAtlas.dirty)) {
context.activeTexture.set(gl.TEXTURE0);
painter.lineAtlas.bind(context);
Expand All @@ -68,11 +73,6 @@ export default function drawLine(painter: Painter, sourceCache: SourceCache, lay
painter.imageManager.bind(context);
}

const uniformValues = dasharray ? lineSDFUniformValues(painter, tile, layer, dasharray) :
image ? linePatternUniformValues(painter, tile, layer, image) :
gradient ? lineGradientUniformValues(painter, tile, layer) :
lineUniformValues(painter, tile, layer);

program.draw(context, gl.TRIANGLES, depthMode,
painter.stencilModeForClipping(coord), colorMode, uniformValues,
layer.id, bucket.layoutVertexBuffer, bucket.indexBuffer, bucket.segments,
Expand Down

0 comments on commit 345070e

Please sign in to comment.