[core] add gfx::UploadPass, split startRender into prepare and upload

2 files changed, 8 insertions, 3 deletions

diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp
index 740ad32244..fcf9a8d8a7 100644
--- a/src/mbgl/annotation/render_annotation_source.cpp
+++ b/src/mbgl/annotation/render_annotation_source.cpp
@@ -47,8 +47,12 @@ void RenderAnnotationSource::update(Immutable<style::Source::Impl> baseImpl_,
                        });
 }
 
-void RenderAnnotationSource::startRender(PaintParameters& parameters) {
-    tilePyramid.startRender(parameters);
+void RenderAnnotationSource::upload(gfx::UploadPass& uploadPass) {
+    tilePyramid.upload(uploadPass);
+}
+
+void RenderAnnotationSource::prepare(PaintParameters& parameters) {
+    tilePyramid.prepare(parameters);
 }
 
 void RenderAnnotationSource::finishRender(PaintParameters& parameters) {
diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp
index 0d08d0af99..46fd9ed06f 100644
--- a/src/mbgl/annotation/render_annotation_source.hpp
+++ b/src/mbgl/annotation/render_annotation_source.hpp
@@ -18,7 +18,8 @@ public:
                 bool needsRelayout,
                 const TileParameters&) final;
 
-    void startRender(PaintParameters&) final;
+    void upload(gfx::UploadPass&) final;
+    void prepare(PaintParameters&) final;
     void finishRender(PaintParameters&) final;
 
     std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final;