Clean up tracing code

- Removed some old optional timing code.
- Separated jobsDone into 2 parts since, on single threaded rendering
  mode (ie macOS), the render aspect blocks until the next vsync which
  confuses tracing

Change-Id: Icb641e3f8079da2cb9af0416b0f7c4dc4dd36c3c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

2 files changed, 6 insertions, 1 deletions

diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp
index a65e3c7ff..c0549a8fd 100644
--- a/src/render/renderers/opengl/renderer/renderer.cpp
+++ b/src/render/renderers/opengl/renderer/renderer.cpp
@@ -368,6 +368,11 @@ void Renderer::setTime(qint64 time)
     m_time = time;
 }
 
+void Renderer::setJobsInLastFrame(int jobsInLastFrame)
+{
+    m_jobsInLastFrame = jobsInLastFrame;
+}
+
 void Renderer::setNodeManagers(NodeManagers *managers)
 {
     m_nodesManager = managers;
@@ -1771,7 +1776,6 @@ void Renderer::skipNextFrame()
 void Renderer::jobsDone(Qt3DCore::QAspectManager *manager)
 {
     // called in main thread once all jobs are done running
-    m_jobsInLastFrame = manager->jobsInLastFrame();
 
     // sync captured renders to frontend
     const QVector<Qt3DCore::QNodeId> pendingCaptureIds = std::move(m_pendingRenderCaptureSendRequests);
diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h
index 48e4a5e3d..4b8574252 100644
--- a/src/render/renderers/opengl/renderer/renderer_p.h
+++ b/src/render/renderers/opengl/renderer/renderer_p.h
@@ -182,6 +182,7 @@ public:
 
     qint64 time() const override;
     void setTime(qint64 time) override;
+    void setJobsInLastFrame(int jobsInLastFrame) override;
 
     void setNodeManagers(NodeManagers *managers) override;
     void setServices(Qt3DCore::QServiceLocator *services) override;