From f94b354b53ba2fc5d12aade7a82790965784afd9 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Sat, 2 Jul 2016 17:04:08 +0300 Subject: [PATCH] [core] Fix typo in shader outline pattern --- src/mbgl/renderer/painter_fill.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp index 290b81cb0..758f934ce 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);