diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-05-28 15:30:14 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-05-28 16:16:42 +0300 |
commit | 2f97a2660ada44cd18f2e02b4de4eb42cfcb07b1 (patch) | |
tree | d59193e56225fed08050add86b618d21da2e87ed /src/mbgl/renderer/layers/render_symbol_layer.cpp | |
parent | 43966f1611c52fef9b7fc344410c3a5235e07765 (diff) | |
download | qtlocation-mapboxgl-2f97a2660ada44cd18f2e02b4de4eb42cfcb07b1.tar.gz |
[core] RenderTile returns textures by const reference
Diffstat (limited to 'src/mbgl/renderer/layers/render_symbol_layer.cpp')
-rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 11469f27cc..a77f26088a 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -123,14 +123,14 @@ void drawIcon(const DrawFn& draw, const bool iconScaled = layout.get<IconSize>().constantOr(1.0) != 1.0 || bucket.iconsNeedLinear; const bool iconTransformed = values.rotationAlignment == AlignmentType::Map || parameters.state.getPitch() != 0; - const gfx::TextureBinding textureBinding{ tile.getIconAtlasTexture()->getResource(), + const gfx::TextureBinding textureBinding{ tile.getIconAtlasTexture().getResource(), bucket.sdfIcons || parameters.state.isChanging() || iconScaled || iconTransformed ? gfx::TextureFilterType::Linear : gfx::TextureFilterType::Nearest }; - const Size& iconSize = tile.getIconAtlasTexture()->size; + const Size& iconSize = tile.getIconAtlasTexture().size; if (bucket.sdfIcons) { if (values.hasHalo) { @@ -189,7 +189,7 @@ void drawText(const DrawFn& draw, const auto& evaluated = getEvaluated<SymbolLayerProperties>(renderData.layerProperties); const auto& layout = bucket.layout; - const gfx::TextureBinding textureBinding{ tile.getGlyphAtlasTexture()->getResource(), + const gfx::TextureBinding textureBinding{ tile.getGlyphAtlasTexture().getResource(), gfx::TextureFilterType::Linear }; auto values = textPropertyValues(evaluated, layout); @@ -198,7 +198,7 @@ void drawText(const DrawFn& draw, const bool alongLine = layout.get<SymbolPlacement>() != SymbolPlacementType::Point && layout.get<TextRotationAlignment>() == AlignmentType::Map; - const Size& texsize = tile.getGlyphAtlasTexture()->size; + const Size& texsize = tile.getGlyphAtlasTexture().size; if (values.hasHalo) { draw(parameters.programs.getSymbolLayerPrograms().symbolGlyph, |