Merge branch 'master' into stephen-improve-accuracy-for-cameraupstream/stephen-improve-accuracy-for-camera

1 files changed, 14 insertions, 2 deletions

diff --git a/platform/default/include/mbgl/gfx/headless_frontend.hpp b/platform/default/include/mbgl/gfx/headless_frontend.hpp
index 8f7a7bf202..8a98b4112d 100644
--- a/platform/default/include/mbgl/gfx/headless_frontend.hpp
+++ b/platform/default/include/mbgl/gfx/headless_frontend.hpp
@@ -1,11 +1,13 @@
 #pragma once
 
+#include <mbgl/gfx/headless_backend.hpp>
+#include <mbgl/gfx/rendering_stats.hpp>
 #include <mbgl/map/camera.hpp>
 #include <mbgl/renderer/renderer_frontend.hpp>
-#include <mbgl/gfx/headless_backend.hpp>
 #include <mbgl/util/async_task.hpp>
 #include <mbgl/util/optional.hpp>
 
+#include <atomic>
 #include <memory>
 
 namespace mbgl {
@@ -16,11 +18,18 @@ class TransformState;
 
 class HeadlessFrontend : public RendererFrontend {
 public:
+    struct RenderResult {
+        PremultipliedImage image;
+        gfx::RenderingStats stats;
+    };
+
     HeadlessFrontend(float pixelRatio_,
+                     gfx::HeadlessBackend::SwapBehaviour swapBehviour = gfx::HeadlessBackend::SwapBehaviour::NoFlush,
                      gfx::ContextMode mode = gfx::ContextMode::Unique,
                      const optional<std::string> localFontFamily = {});
     HeadlessFrontend(Size,
                      float pixelRatio_,
+                     gfx::HeadlessBackend::SwapBehaviour swapBehviour = gfx::HeadlessBackend::SwapBehaviour::NoFlush,
                      gfx::ContextMode mode = gfx::ContextMode::Unique,
                      const optional<std::string> localFontFamily = {});
     ~HeadlessFrontend() override;
@@ -29,6 +38,7 @@ public:
     void update(std::shared_ptr<UpdateParameters>) override;
     void setObserver(RendererObserver&) override;
 
+    double getFrameTime() const;
     Size getSize() const;
     void setSize(Size);
 
@@ -44,7 +54,8 @@ public:
     LatLng latLngForPixel(const ScreenCoordinate&);
 
     PremultipliedImage readStillImage();
-    PremultipliedImage render(Map&);
+    RenderResult render(Map&);
+    void renderOnce(Map&);
 
     optional<TransformState> getTransformState() const;
 
@@ -52,6 +63,7 @@ private:
     Size size;
     float pixelRatio;
 
+    std::atomic<double> frameTime;
     std::unique_ptr<gfx::HeadlessBackend> backend;
     util::AsyncTask asyncInvalidate;