[core] add gfx::UploadPass, split startRender into prepare and uploadupstream/gfx-refactor-7

1 files changed, 9 insertions, 3 deletions

diff --git a/src/mbgl/renderer/buckets/debug_bucket.hpp b/src/mbgl/renderer/buckets/debug_bucket.hpp
index 30d5ff67c8..2b735b4987 100644
--- a/src/mbgl/renderer/buckets/debug_bucket.hpp
+++ b/src/mbgl/renderer/buckets/debug_bucket.hpp
@@ -8,13 +8,14 @@
 #include <mbgl/gfx/vertex_buffer.hpp>
 #include <mbgl/gfx/index_buffer.hpp>
 #include <mbgl/programs/debug_program.hpp>
+#include <mbgl/programs/fill_program.hpp>
 
 namespace mbgl {
 
 class OverscaledTileID;
 
 namespace gl {
-class Context;
+class UploadPass;
 } // namespace gl
 
 class DebugBucket : private util::noncopyable {
@@ -24,8 +25,9 @@ public:
                 bool complete,
                 optional<Timestamp> modified,
                 optional<Timestamp> expires,
-                MapDebugOptions,
-                gfx::Context&);
+                MapDebugOptions);
+
+    void upload(gfx::UploadPass&);
 
     const bool renderable;
     const bool complete;
@@ -33,6 +35,10 @@ public:
     const optional<Timestamp> expires;
     const MapDebugOptions debugMode;
 
+
+    gfx::VertexVector<FillLayoutVertex> vertices;
+    gfx::IndexVector<gfx::Lines> indices;
+
     SegmentVector<DebugAttributes> segments;
     optional<gfx::VertexBuffer<DebugLayoutVertex>> vertexBuffer;
     optional<gfx::IndexBuffer> indexBuffer;