diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-01 10:30:49 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 10:18:43 -0700 |
| commit | 92252849c1a2ddf7887d1908841fa3c90dd59766 (patch) | |
| tree | 9d192d0e60b46479122ea2e4a606b598287d49d7 /src/mbgl/renderer/painters/painter_symbol.cpp | |
| parent | b201a7900f989af432aaea500a0e6c5ea5bbba53 (diff) | |
| download | qtlocation-mapboxgl-92252849c1a2ddf7887d1908841fa3c90dd59766.tar.gz | |
[core] Per-bucket glyph atlases
Diffstat (limited to 'src/mbgl/renderer/painters/painter_symbol.cpp')
| -rw-r--r-- | src/mbgl/renderer/painters/painter_symbol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painters/painter_symbol.cpp b/src/mbgl/renderer/painters/painter_symbol.cpp index 563489987c..5a5264d178 100644 --- a/src/mbgl/renderer/painters/painter_symbol.cpp +++ b/src/mbgl/renderer/painters/painter_symbol.cpp @@ -105,12 +105,12 @@ void Painter::renderSymbol(PaintParameters& parameters, } if (bucket.hasTextData()) { - glyphAtlas->bind(context, 0); + context.bindTexture(*bucket.text.atlasTexture, 0, gl::TextureFilter::Linear); auto values = layer.textPropertyValues(layout); auto paintPropertyValues = layer.textPaintProperties(); - const Size texsize = glyphAtlas->getSize(); + const Size texsize = bucket.text.atlasTexture->size; if (values.hasHalo) { draw(parameters.programs.symbolGlyph, |