diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-10-26 16:39:25 -0700 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-01 18:41:52 +0100 |
| commit | 9e3839781fdf1b1c6a2d61a5de9b2c7ddd68e9ed (patch) | |
| tree | cde9eb4e99341e5200ca5a06a4a1d0fc602c9232 /src/mbgl/renderer | |
| parent | e2981c890e9a758c4dee703fa9e25e5d9eff65ce (diff) | |
| download | qtlocation-mapboxgl-9e3839781fdf1b1c6a2d61a5de9b2c7ddd68e9ed.tar.gz | |
[core] convert SpriteAtlas to use managed texture handling
Diffstat (limited to 'src/mbgl/renderer')
| -rw-r--r-- | src/mbgl/renderer/painter_symbol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index d4ac5f94e9..a00389ce20 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -72,7 +72,7 @@ void Painter::renderSymbol(PaintParameters& parameters, const bool iconTransformed = values.rotationAlignment == AlignmentType::Map || state.getPitch() != 0; atlas.bind(bucket.sdfIcons || state.isChanging() || iconScaled || iconTransformed, context, 0); - std::array<uint16_t, 2> texsize {{ atlas.getWidth(), atlas.getHeight() }}; + const Size texsize = atlas.getSize(); if (bucket.sdfIcons) { if (values.hasHalo()) { @@ -101,7 +101,7 @@ void Painter::renderSymbol(PaintParameters& parameters, auto values = layer.impl->textPropertyValues(layout); - std::array<uint16_t, 2> texsize {{ glyphAtlas->width, glyphAtlas->height }}; + const Size texsize { glyphAtlas->width, glyphAtlas->height }; if (values.hasHalo()) { draw(parameters.shaders.symbolGlyph, |