diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-04 15:26:00 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-06 14:47:58 -0700 |
| commit | 21d7ee11e1cc0cd129f40df5bea2e07bfcc2a9e4 (patch) | |
| tree | 771918967c0bdad79ba98f231d50436e633de369 /src/mbgl/renderer/painter_symbol.cpp | |
| parent | 388fa9cf1039493f98f24005d1c7ddaa0ff95b3d (diff) | |
| download | qtlocation-mapboxgl-21d7ee11e1cc0cd129f40df5bea2e07bfcc2a9e4.tar.gz | |
[core] Rationalize shader names
{layer type}{subtype}Shader
Diffstat (limited to 'src/mbgl/renderer/painter_symbol.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter_symbol.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index a91329d003..ca77215618 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -19,8 +19,8 @@ void Painter::renderSDF(SymbolBucket& bucket, const RenderTile& tile, float sdfFontSize, std::array<float, 2> texsize, - SDFShader& sdfShader, - void (SymbolBucket::*drawSDF)(SDFShader&, gl::Context&, PaintMode), + SymbolSDFShader& sdfShader, + void (SymbolBucket::*drawSDF)(SymbolSDFShader&, gl::Context&, PaintMode), // Layout AlignmentType rotationAlignment, @@ -168,7 +168,7 @@ void Painter::renderSymbol(PaintParameters& parameters, tile, 1.0f, {{ float(activeSpriteAtlas->getWidth()) / 4.0f, float(activeSpriteAtlas->getHeight()) / 4.0f }}, - parameters.shaders.sdfIcon, + parameters.shaders.symbolIconSDF, &SymbolBucket::drawIcons, layout.iconRotationAlignment, // icon-pitch-alignment is not yet implemented @@ -200,7 +200,7 @@ void Painter::renderSymbol(PaintParameters& parameters, }}; } - auto& iconShader = parameters.shaders.icon; + auto& iconShader = parameters.shaders.symbolIcon; context.program = iconShader.getID(); iconShader.u_matrix = vtxMatrix; @@ -235,7 +235,7 @@ void Painter::renderSymbol(PaintParameters& parameters, tile, 24.0f, {{ float(glyphAtlas->width) / 4, float(glyphAtlas->height) / 4 }}, - parameters.shaders.sdfGlyph, + parameters.shaders.symbolGlyph, &SymbolBucket::drawGlyphs, layout.textRotationAlignment, layout.textPitchAlignment, |