diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-02 14:11:37 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-05-15 11:57:43 -0700 |
commit | da5bd4d6e3a0202cc4f9e4d3d17e159eb90acba6 (patch) | |
tree | 9450b28ea53804129de6cc049404bbef2b83778c /src/mbgl/renderer/layers/render_symbol_layer.cpp | |
parent | d5e7fabf455d3e8e6cb852fa544649c8012d70ed (diff) | |
download | qtlocation-mapboxgl-da5bd4d6e3a0202cc4f9e4d3d17e159eb90acba6.tar.gz |
[core] use unique IDs for DrawScopes
Diffstat (limited to 'src/mbgl/renderer/layers/render_symbol_layer.cpp')
-rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 5c0aea0eac..9429cff469 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -166,7 +166,8 @@ void drawIcon(const DrawFn& draw, paintPropertyValues, SymbolSDFIconProgram::TextureBindings{ textureBinding - }); + }, + "halo"); } if (values.hasFill) { @@ -180,7 +181,8 @@ void drawIcon(const DrawFn& draw, paintPropertyValues, SymbolSDFIconProgram::TextureBindings{ textureBinding - }); + }, + "fill"); } } else { draw(parameters.programs.getSymbolLayerPrograms().symbolIcon, @@ -193,7 +195,8 @@ void drawIcon(const DrawFn& draw, paintPropertyValues, SymbolIconProgram::TextureBindings{ textureBinding - }); + }, + "icon"); } } @@ -311,7 +314,8 @@ void drawText(const DrawFn& draw, paintPropertyValues, SymbolSDFTextProgram::TextureBindings{ textureBinding - }); + }, + "halo"); } if (values.hasFill) { @@ -325,7 +329,8 @@ void drawText(const DrawFn& draw, paintPropertyValues, SymbolSDFTextProgram::TextureBindings{ textureBinding - }); + }, + "fill"); } } @@ -409,7 +414,8 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { const SymbolPropertyValues& values_, const auto& binders, const auto& paintProperties, - const auto& textureBindings) { + const auto& textureBindings, + const std::string& suffix) { const auto allUniformValues = programInstance.computeAllUniformValues( uniformValues, *symbolSizeBinder, @@ -445,7 +451,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { allUniformValues, allAttributeBindings, textureBindings, - this->getID() + this->getID() + "/" + suffix ); }, [&](const std::reference_wrapper<SegmentVector<SymbolTextAttributes>>& segmentVector) { @@ -464,7 +470,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { allUniformValues, allAttributeBindings, textureBindings, - this->getID() + this->getID() + "/" + suffix ); } ); |