diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-05-13 17:13:31 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-05-15 10:55:58 -0700 |
commit | 867555b1c9ef51fec23ce77c682cf7d5b5a23c5e (patch) | |
tree | de380cbb7f5553282b081dce9202cbe9e502ebe5 /src/mbgl/renderer/buckets/debug_bucket.cpp | |
parent | 1a9e93e8d5fc6fd027160b3126eab03d0809ca69 (diff) | |
download | qtlocation-mapboxgl-upstream/gfx-refactor-7.tar.gz |
[core] add gfx::UploadPass, split startRender into prepare and uploadupstream/gfx-refactor-7
Diffstat (limited to 'src/mbgl/renderer/buckets/debug_bucket.cpp')
-rw-r--r-- | src/mbgl/renderer/buckets/debug_bucket.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mbgl/renderer/buckets/debug_bucket.cpp b/src/mbgl/renderer/buckets/debug_bucket.cpp index dac7622996..13380c0905 100644 --- a/src/mbgl/renderer/buckets/debug_bucket.cpp +++ b/src/mbgl/renderer/buckets/debug_bucket.cpp @@ -1,5 +1,4 @@ #include <mbgl/renderer/buckets/debug_bucket.hpp> -#include <mbgl/programs/fill_program.hpp> #include <mbgl/geometry/debug_font_data.hpp> #include <mbgl/tile/tile_id.hpp> #include <mbgl/util/string.hpp> @@ -16,8 +15,7 @@ DebugBucket::DebugBucket(const OverscaledTileID& id, const bool complete_, optional<Timestamp> modified_, optional<Timestamp> expires_, - MapDebugOptions debugMode_, - gfx::Context& context) + MapDebugOptions debugMode_) : renderable(renderable_), complete(complete_), modified(std::move(modified_)), @@ -25,9 +23,6 @@ DebugBucket::DebugBucket(const OverscaledTileID& id, debugMode(debugMode_), drawScopeID("__debug/" + util::toHex(util::nextID())) { - gfx::VertexVector<FillLayoutVertex> vertices; - gfx::IndexVector<gfx::Lines> indices; - auto addText = [&] (const std::string& text, double left, double baseline, double scale) { for (uint8_t c : text) { if (c < 32 || c >= 127) @@ -77,10 +72,12 @@ DebugBucket::DebugBucket(const OverscaledTileID& id, } segments.emplace_back(0, 0, vertices.elements(), indices.elements()); +} +void DebugBucket::upload(gfx::UploadPass& uploadPass) { if (!vertices.empty()) { - vertexBuffer = context.createVertexBuffer(std::move(vertices)); - indexBuffer = context.createIndexBuffer(std::move(indices)); + vertexBuffer = uploadPass.createVertexBuffer(std::move(vertices)); + indexBuffer = uploadPass.createIndexBuffer(std::move(indices)); } } |