diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-07-02 17:04:08 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-07-02 17:17:28 +0300 |
commit | f94b354b53ba2fc5d12aade7a82790965784afd9 (patch) | |
tree | 9d1d395b827bdbc8c5aaa6c3b7e0aa7e8e3e7f95 /src | |
parent | b3c07b027781da81bec7f2e55a8688d933c0d10c (diff) | |
download | qtlocation-mapboxgl-f94b354b53ba2fc5d12aade7a82790965784afd9.tar.gz |
[core] Fix typo in shader outline pattern
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/renderer/painter_fill.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp index 290b81cb06..758f934ce1 100644 --- a/src/mbgl/renderer/painter_fill.cpp +++ b/src/mbgl/renderer/painter_fill.cpp @@ -115,9 +115,6 @@ void Painter::renderFill(FillBucket& bucket, config.program = shaderOutlinePattern->getID(); shaderOutlinePattern->u_matrix = vertexMatrix; - // Draw the entire line - shaderOutline->u_world = worldSize; - shaderOutlinePattern->u_pattern_tl_a = imagePosA->tl; shaderOutlinePattern->u_pattern_br_a = imagePosA->br; shaderOutlinePattern->u_pattern_tl_b = imagePosB->tl; @@ -133,6 +130,9 @@ void Painter::renderFill(FillBucket& bucket, shaderOutlinePattern->u_pixel_coord_upper = {{ float(pixelX >> 16), float(pixelY >> 16) }}; shaderOutlinePattern->u_pixel_coord_lower = {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF) }}; + // Draw the entire line + shaderOutlinePattern->u_world = worldSize; + config.activeTexture = GL_TEXTURE0; spriteAtlas->bind(true, store); |