From 21d7ee11e1cc0cd129f40df5bea2e07bfcc2a9e4 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 4 Oct 2016 15:26:00 -0700 Subject: [core] Rationalize shader names {layer type}{subtype}Shader --- src/mbgl/renderer/painter_fill.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mbgl/renderer/painter_fill.cpp') diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp index 6d6ae4df61..50ead900f6 100644 --- a/src/mbgl/renderer/painter_fill.cpp +++ b/src/mbgl/renderer/painter_fill.cpp @@ -43,10 +43,10 @@ void Painter::renderFill(PaintParameters& parameters, context.depthMask = true; context.lineWidth = 2.0f; // This is always fixed and does not depend on the pixelRatio! - auto& outlineShader = parameters.shaders.outline; - auto& patternShader = parameters.shaders.pattern; - auto& outlinePatternShader = parameters.shaders.outlinePattern; - auto& plainShader = parameters.shaders.plain; + auto& outlineShader = parameters.shaders.fillOutline; + auto& patternShader = parameters.shaders.fillPattern; + auto& outlinePatternShader = parameters.shaders.fillOutlinePattern; + auto& plainShader = parameters.shaders.fill; // Because we're drawing top-to-bottom, and we update the stencil mask // befrom, we have to draw the outline first (!) -- cgit v1.2.1