[core] Remove ImageManager from upload parameters

2019-05-27 11:52:54 +03:00
parent 892699a39a
commit c0e5632001
7 changed files with 16 additions and 21 deletions
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -301,11 +301,8 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
    }

    for (auto& renderItem : renderItems) {
-        if (!renderItem.source) {
-            continue;
-        }
        RenderLayer& renderLayer = renderItem.layer;
-        renderLayer.prepare({renderItem.source, updateParameters.transformState});
+        renderLayer.prepare({renderItem.source, *imageManager, updateParameters.transformState});
        if (renderLayer.needsPlacement()) {
            layersNeedPlacement.emplace_back(renderLayer);
        }
@@ -385,7 +382,6 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {

        UploadParameters uploadParameters{
            updateParameters.transformState,
-            *imageManager,
            *lineAtlas,
        };