summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2017-11-13 12:10:34 -0800
committerChris Loer <chris.loer@gmail.com>2017-11-13 12:10:34 -0800
commitad8e3ef0019b2753bc9dace6b702bb39bd418f7f (patch)
treec257f041fefe359051214ef16008a6dbacb5476b
parentb989abe5ae4e834968269104345f35a219cdd055 (diff)
downloadqtlocation-mapboxgl-upstream/viewport-collision-small-stuff.tar.gz
Make RenderLayer friend CrossTileSymbolIndex and Placement instead of making renderTiles entirely public.upstream/viewport-collision-small-stuff
-rw-r--r--src/mbgl/renderer/render_layer.hpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mbgl/renderer/render_layer.hpp b/src/mbgl/renderer/render_layer.hpp
index aa5777a186..55831cb72c 100644
--- a/src/mbgl/renderer/render_layer.hpp
+++ b/src/mbgl/renderer/render_layer.hpp
@@ -81,10 +81,14 @@ public:
friend std::string layoutKey(const RenderLayer&);
+protected:
+ // renderTiles are exposed directly to CrossTileSymbolIndex and Placement so they
+ // can update opacities in the symbol buckets immediately before rendering
+ friend class CrossTileSymbolIndex;
+ friend class Placement;
// Stores current set of tiles to be rendered for this layer.
std::vector<std::reference_wrapper<RenderTile>> renderTiles;
-protected:
// Stores what render passes this layer is currently enabled for. This depends on the
// evaluated StyleProperties object and is updated accordingly.
RenderPass passes = RenderPass::None;