stash more experimenting and debug prints

5 files changed, 17 insertions, 1 deletions

diff --git a/platform/default/src/mbgl/gfx/headless_frontend.cpp b/platform/default/src/mbgl/gfx/headless_frontend.cpp
index f716c452a4..e097efe13c 100644
--- a/platform/default/src/mbgl/gfx/headless_frontend.cpp
+++ b/platform/default/src/mbgl/gfx/headless_frontend.cpp
@@ -49,6 +49,8 @@ void HeadlessFrontend::reset() {
     assert(renderer);
     // TODO: watch out, map::impl calls this
     renderer.reset();
+    optional<std::string> localFontFamily;
+    renderer = std::make_unique<Renderer>(*getBackend(), pixelRatio, localFontFamily);
 }
 
 void HeadlessFrontend::update(std::shared_ptr<UpdateParameters> updateParameters_) {
@@ -63,6 +65,7 @@ PremultipliedImage HeadlessFrontend::updateSync(std::shared_ptr<UpdateParameters
     std::unique_ptr<RenderTree> renderTree = nullptr;
     while (!renderTree) {
         util::RunLoop::Get()->runOnce();
+        std::clog << "reateRenderTree\n";
         renderTree = orchestrator.createRenderTree(params);
     }
     renderer->impl->render(*renderTree);
diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp
index 983bc09485..18ec2fecf8 100644
--- a/src/mbgl/renderer/render_orchestrator.cpp
+++ b/src/mbgl/renderer/render_orchestrator.cpp
@@ -26,6 +26,7 @@
 #include <mbgl/util/math.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/logging.hpp>
+#include <iostream>
 
 namespace mbgl {
 
@@ -329,6 +330,8 @@ std::unique_ptr<RenderTree> RenderOrchestrator::createRenderTree(const UpdatePar
 
     renderTreeParameters->loaded = updateParameters.styleLoaded && isLoaded();
     if (!isMapModeContinuous && !renderTreeParameters->loaded) {
+        // std::clog << "updateParameters.styleLoaded " << updateParameters.styleLoaded << "\n";
+        // std::clog << "isLoaded" << isLoaded() << "\n";
         return nullptr;
     }
 
@@ -614,13 +617,17 @@ bool RenderOrchestrator::hasTransitions(TimePoint timePoint) const {
 }
 
 bool RenderOrchestrator::isLoaded() const {
+    auto count = 0;
     for (const auto& entry: renderSources) {
+        count++;
         if (!entry.second->isLoaded()) {
+            // std::clog << "source not loaded " << count << " of " << renderSources.size() << "\n";
             return false;
         }
     }
 
     if (!imageManager->isLoaded()) {
+        std::clog << "imageManager not loaded\n";
         return false;
     }
 
diff --git a/src/mbgl/renderer/render_source.cpp b/src/mbgl/renderer/render_source.cpp
index 7b47602cd1..30380d220c 100644
--- a/src/mbgl/renderer/render_source.cpp
+++ b/src/mbgl/renderer/render_source.cpp
@@ -13,12 +13,13 @@
 #include <mbgl/layermanager/layer_manager.hpp>
 #include <mbgl/util/constants.hpp>
 #include <utility>
-
+#include <iostream>
 namespace mbgl {
 
 using namespace style;
 
 std::unique_ptr<RenderSource> RenderSource::create(Immutable<Source::Impl> impl) {
+    std::clog << "RenderSource::create \n";
     switch (impl->type) {
     case SourceType::Vector:
         return std::make_unique<RenderVectorSource>(staticImmutableCast<VectorSource::Impl>(impl));
diff --git a/src/mbgl/renderer/sources/render_tile_source.cpp b/src/mbgl/renderer/sources/render_tile_source.cpp
index c5afb38435..7c298ff698 100644
--- a/src/mbgl/renderer/sources/render_tile_source.cpp
+++ b/src/mbgl/renderer/sources/render_tile_source.cpp
@@ -9,6 +9,7 @@
 #include <mbgl/tile/vector_tile.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/math.hpp>
+#include <iostream>
 
 namespace mbgl {
 
@@ -45,6 +46,7 @@ void TileSourceRenderItem::render(PaintParameters& parameters) const {
 RenderTileSource::RenderTileSource(Immutable<style::Source::Impl> impl_)
     : RenderSource(std::move(impl_))
     , renderTiles(makeMutable<std::vector<RenderTile>>()) {
+      std::clog << "creating at RenderTileSource\n";
     tilePyramid.setObserver(this);
 }
 
diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp
index 54e0b1eb26..ac5a46691f 100644
--- a/src/mbgl/renderer/tile_pyramid.cpp
+++ b/src/mbgl/renderer/tile_pyramid.cpp
@@ -16,6 +16,7 @@
 
 #include <cmath>
 #include <algorithm>
+#include <iostream>
 
 namespace mbgl {
 
@@ -25,6 +26,7 @@ static TileObserver nullObserver;
 
 TilePyramid::TilePyramid()
     : observer(&nullObserver) {
+      std::clog << "creating TilePyramid\n";
 }
 
 TilePyramid::~TilePyramid() = default;
@@ -60,6 +62,7 @@ void TilePyramid::update(const std::vector<Immutable<style::LayerProperties>>& l
                          std::function<std::unique_ptr<Tile> (const OverscaledTileID&)> createTile) {
     // If we need a relayout, abandon any cached tiles; they're now stale.
     if (needsRelayout) {
+        std::clog << "needing relayout\n";
         cache.clear();
     }