diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-05-22 11:01:54 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-05-28 16:16:42 +0300 |
commit | a03f7b166b2fe68f63ca75337bd0ac0000cee135 (patch) | |
tree | f4435b998b5775a4596392bcc45bea020c09527e /src/mbgl/renderer/layers/render_fill_layer.cpp | |
parent | e5431d01817c0546aa0b971a7b0b33c9bbd87077 (diff) | |
download | qtlocation-mapboxgl-a03f7b166b2fe68f63ca75337bd0ac0000cee135.tar.gz |
[core] RenderTile does not expose Tile
RenderTile and Tile will be split when ochestration movces to a separate thread.
This PR improves encapsulation of Tiles management: now performed within TilePyramid.
Diffstat (limited to 'src/mbgl/renderer/layers/render_fill_layer.cpp')
-rw-r--r-- | src/mbgl/renderer/layers/render_fill_layer.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index 73b6c3d596..64e0f0bba1 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -76,7 +76,7 @@ void RenderFillLayer::render(PaintParameters& parameters) { if (unevaluated.get<FillPattern>().isUndefined()) { parameters.renderTileClippingMasks(renderTiles); for (const RenderTile& tile : renderTiles) { - const LayerRenderData* renderData = tile.tile.getLayerRenderData(*baseImpl); + const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; } @@ -163,7 +163,7 @@ void RenderFillLayer::render(PaintParameters& parameters) { parameters.renderTileClippingMasks(renderTiles); for (const RenderTile& tile : renderTiles) { - const LayerRenderData* renderData = tile.tile.getLayerRenderData(*baseImpl); + const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; } @@ -172,9 +172,8 @@ void RenderFillLayer::render(PaintParameters& parameters) { const auto& crossfade = getCrossfade<FillLayerProperties>(renderData->layerProperties); const auto& fillPatternValue = evaluated.get<FillPattern>().constantOr(Faded<std::basic_string<char>>{"", ""}); - auto& geometryTile = static_cast<GeometryTile&>(tile.tile); - optional<ImagePosition> patternPosA = geometryTile.getPattern(fillPatternValue.from); - optional<ImagePosition> patternPosB = geometryTile.getPattern(fillPatternValue.to); + optional<ImagePosition> patternPosA = tile.getPattern(fillPatternValue.from); + optional<ImagePosition> patternPosB = tile.getPattern(fillPatternValue.to); auto draw = [&] (auto& programInstance, const auto& drawMode, @@ -191,7 +190,7 @@ void RenderFillLayer::render(PaintParameters& parameters) { evaluated.get<FillTranslateAnchor>(), parameters.state), parameters.backend.getDefaultRenderable().getSize(), - geometryTile.iconAtlasTexture->size, + tile.getIconAtlasTexture()->size, crossfade, tile.id, parameters.state, @@ -233,7 +232,7 @@ void RenderFillLayer::render(PaintParameters& parameters) { *bucket.triangleIndexBuffer, bucket.triangleSegments, FillPatternProgram::TextureBindings{ - textures::image::Value{ geometryTile.iconAtlasTexture->getResource(), gfx::TextureFilterType::Linear }, + textures::image::Value{ tile.getIconAtlasTexture()->getResource(), gfx::TextureFilterType::Linear }, }); } if (evaluated.get<FillAntialias>() && unevaluated.get<FillOutlineColor>().isUndefined()) { @@ -243,7 +242,7 @@ void RenderFillLayer::render(PaintParameters& parameters) { *bucket.lineIndexBuffer, bucket.lineSegments, FillOutlinePatternProgram::TextureBindings{ - textures::image::Value{ geometryTile.iconAtlasTexture->getResource(), gfx::TextureFilterType::Linear }, + textures::image::Value{ tile.getIconAtlasTexture()->getResource(), gfx::TextureFilterType::Linear }, }); } } |