diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-07 12:45:35 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 10:18:43 -0700 |
| commit | 0b687312071305c050d97e04fef1c80193f443c5 (patch) | |
| tree | 64c20efaa17fefef9f902811a000fd6e425c849b /src/mbgl/renderer/painters/painter_symbol.cpp | |
| parent | 92252849c1a2ddf7887d1908841fa3c90dd59766 (diff) | |
| download | qtlocation-mapboxgl-0b687312071305c050d97e04fef1c80193f443c5.tar.gz | |
[core] Per-bucket icon atlases
Diffstat (limited to 'src/mbgl/renderer/painters/painter_symbol.cpp')
| -rw-r--r-- | src/mbgl/renderer/painters/painter_symbol.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mbgl/renderer/painters/painter_symbol.cpp b/src/mbgl/renderer/painters/painter_symbol.cpp index 5a5264d178..13baa1a514 100644 --- a/src/mbgl/renderer/painters/painter_symbol.cpp +++ b/src/mbgl/renderer/painters/painter_symbol.cpp @@ -5,7 +5,6 @@ #include <mbgl/renderer/layers/render_symbol_layer.hpp> #include <mbgl/style/layers/symbol_layer_impl.hpp> #include <mbgl/text/glyph_atlas.hpp> -#include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/programs/programs.hpp> #include <mbgl/programs/symbol_program.hpp> #include <mbgl/programs/collision_box_program.hpp> @@ -69,9 +68,12 @@ void Painter::renderSymbol(PaintParameters& parameters, const bool iconScaled = layout.get<IconSize>().constantOr(1.0) != 1.0 || bucket.iconsNeedLinear; const bool iconTransformed = values.rotationAlignment == AlignmentType::Map || state.getPitch() != 0; - spriteAtlas->bind(bucket.sdfIcons || state.isChanging() || iconScaled || iconTransformed, context, 0); - const Size texsize = spriteAtlas->getPixelSize(); + context.bindTexture(*bucket.icon.atlasTexture, 0, + bucket.sdfIcons || state.isChanging() || iconScaled || iconTransformed + ? gl::TextureFilter::Linear : gl::TextureFilter::Nearest); + + const Size texsize = bucket.icon.atlasTexture->size; if (bucket.sdfIcons) { if (values.hasHalo) { |