[core] Merge RenderLayer::uploadBuckets into RenderSource::startRender

2 files changed, 5 insertions, 8 deletions

diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp
index 82ddd318bd..7fb7caa580 100644
--- a/src/mbgl/renderer/sources/render_image_source.cpp
+++ b/src/mbgl/renderer/sources/render_image_source.cpp
@@ -27,10 +27,10 @@ bool RenderImageSource::isLoaded() const {
 }
 
 void RenderImageSource::startRender(Painter& painter) {
-
     if (!isLoaded()) {
         return;
     }
+
     matrices.clear();
 
     for (size_t i = 0; i < tileIds.size(); i++) {
@@ -40,6 +40,10 @@ void RenderImageSource::startRender(Painter& painter) {
         matrix::multiply(matrix, painter.projMatrix, matrix);
         matrices.push_back(matrix);
     }
+
+    if (bucket->needsUpload() && shouldRender) {
+        bucket->upload(painter.context);
+    }
 }
 
 void RenderImageSource::finishRender(Painter& painter) {
@@ -63,12 +67,6 @@ std::vector<Feature> RenderImageSource::querySourceFeatures(const SourceQueryOpt
     return {};
 }
 
-void RenderImageSource::upload(gl::Context& context) {
-    if (isLoaded() && bucket->needsUpload() && shouldRender) {
-        bucket->upload(context);
-    }
-}
-
 void RenderImageSource::update(Immutable<style::Source::Impl> baseImpl_,
                                const std::vector<Immutable<Layer::Impl>>&,
                                const bool needsRendering,
diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp
index 175330b35f..5175cbf4a4 100644
--- a/src/mbgl/renderer/sources/render_image_source.hpp
+++ b/src/mbgl/renderer/sources/render_image_source.hpp
@@ -19,7 +19,6 @@ public:
     ~RenderImageSource() override;
 
     bool isLoaded() const final;
-    void upload(gl::Context&);
 
     void startRender(Painter&) final;
     void render(Painter&, PaintParameters&, const RenderLayer&);