From 23d8ae5e738741c2c31e82e9b33a8c05f21ea3d6 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Wed, 12 Jun 2019 12:29:28 +0300 Subject: [core] Simplify RenderLayer::upload() Now `RenderLayer::upload()` accepts only `uploadPass`, similar to other uploadable objects. Few simplifications were made in the `LineLayer` prepare stage. --- src/mbgl/renderer/renderer_impl.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/mbgl/renderer/renderer_impl.cpp') 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); } } -- cgit v1.2.1