rename prepare => upload and determine passes per layer instead of per bucket

1 files changed, 5 insertions, 11 deletions

diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp
index 282a6aa367..36210f9cb5 100644
--- a/src/mbgl/renderer/bucket.hpp
+++ b/src/mbgl/renderer/bucket.hpp
@@ -1,6 +1,7 @@
 #ifndef MBGL_RENDERER_BUCKET
 #define MBGL_RENDERER_BUCKET
 
+#include <mbgl/renderer/render_pass.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/mat4.hpp>
 
@@ -10,17 +11,11 @@ class Painter;
 class StyleLayer;
 class TileID;
 
-enum class RenderPass : uint8_t {
-    Prepare = 1 << 0,
-    Opaque = 1 << 1,
-    Translucent = 1 << 2,
-};
-
 class Bucket : private util::noncopyable {
 public:
     // As long as this bucket has a Prepare render pass, this function is getting called. Typically,
     // this only happens once when the bucket is being rendered for the first time.
-    virtual void prepare() = 0;
+    virtual void upload() = 0;
 
     // Every time this bucket is getting rendered, this function is called. This happens either
     // once or twice (for Opaque and Transparent render passes).
@@ -28,13 +23,12 @@ public:
 
     virtual ~Bucket() {}
 
-    inline bool hasRenderPass(RenderPass pass) const {
-        return static_cast<std::underlying_type<RenderPass>::type>(renderPass) &
-               static_cast<std::underlying_type<RenderPass>::type>(pass);
+    inline bool needsUpload() const {
+        return uploaded;
     }
 
 protected:
-    RenderPass renderPass = RenderPass::Prepare;
+    bool uploaded = false;
 
 };