diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-06-12 12:29:28 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-06-25 12:53:52 +0300 |
commit | 23d8ae5e738741c2c31e82e9b33a8c05f21ea3d6 (patch) | |
tree | 8466fd1540d3c48ce400d4ce7df25b6a9e58ca32 /src/mbgl/renderer/renderer_impl.cpp | |
parent | 290a9fcad57c92a01e2a401df07fea3d7dfacf08 (diff) | |
download | qtlocation-mapboxgl-23d8ae5e738741c2c31e82e9b33a8c05f21ea3d6.tar.gz |
[core] Simplify RenderLayer::upload()
Now `RenderLayer::upload()` accepts only `uploadPass`, similar to other uploadable objects.
Few simplifications were made in the `LineLayer` prepare stage.
Diffstat (limited to 'src/mbgl/renderer/renderer_impl.cpp')
-rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index c7cca3a659..9ab65e57bf 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -308,7 +308,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { for (auto& renderItem : renderItems) { RenderLayer& renderLayer = renderItem.layer; - renderLayer.prepare({renderItem.source, *imageManager, *patternAtlas, updateParameters.transformState}); + renderLayer.prepare({renderItem.source, *imageManager, *patternAtlas, *lineAtlas, updateParameters.transformState}); if (renderLayer.needsPlacement()) { layersNeedPlacement.emplace_back(renderLayer); } @@ -386,15 +386,10 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { } } - UploadParameters uploadParameters{ - updateParameters.transformState, - *lineAtlas, - }; - for (auto& renderItem : renderItems) { RenderLayer& renderLayer = renderItem.layer; if (renderLayer.hasRenderPass(RenderPass::Upload)) { - renderLayer.upload(*uploadPass, uploadParameters); + renderLayer.upload(*uploadPass); } } |