Renderer refactored to only process jobs for the current frame

- get rid of the RenderQueues
- properly synchronize the RenderQueue/Allocators
- unit tests updated

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

2 files changed, 2 insertions, 10 deletions

diff --git a/src/render/backend/jobs/renderviewjob.cpp b/src/render/backend/jobs/renderviewjob.cpp
index 9115b90ed..6819aed38 100644
--- a/src/render/backend/jobs/renderviewjob.cpp
+++ b/src/render/backend/jobs/renderviewjob.cpp
@@ -41,7 +41,6 @@
 #include <Qt3DRenderer/private/renderviewjobutils_p.h>
 #include <Qt3DRenderer/private/renderlogging_p.h>
 
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
@@ -49,19 +48,18 @@ namespace Render {
 
 void RenderViewJob::run()
 {
-    qCDebug(Jobs) << Q_FUNC_INFO << m_index << " frame " << m_frameIndex;
+    qCDebug(Jobs) << Q_FUNC_INFO << m_index;
 
     // Create a RenderView object
     // The RenderView are created from a QFrameAllocator stored in the current Thread local storage
 
-    QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator(m_frameIndex);
+    QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
     RenderView *renderView = currentFrameAllocator->allocate<RenderView>();
 
     // RenderView should allocate heap resources using only the currentFrameAllocator
     renderView->setAllocator(currentFrameAllocator);
     renderView->setRenderer(m_renderer);
     renderView->setSurfaceSize(m_surfaceSize);
-    renderView->setFrameIndex(m_frameIndex);
 
     // Populate the renderview's configuration from the framegraph
     setRenderViewConfigFromFrameGraphLeafNode(renderView, m_fgLeaf);
diff --git a/src/render/backend/jobs/renderviewjob_p.h b/src/render/backend/jobs/renderviewjob_p.h
index 2651d4262..bbaa494b9 100644
--- a/src/render/backend/jobs/renderviewjob_p.h
+++ b/src/render/backend/jobs/renderviewjob_p.h
@@ -68,8 +68,6 @@ public:
         m_fgLeaf = fgLeaf;
     }
 
-    inline void setFrameIndex(int frameIndex) { m_frameIndex = frameIndex; }
-
     // Sets the position in the queue of RenderViews that the
     // RenderView generated by this job should be inserted. This is
     // used to ensure that for example a RenderView for creating
@@ -85,10 +83,6 @@ private:
     QSize m_surfaceSize;
     FrameGraphNode *m_fgLeaf;
     int m_index;
-    // Indicates which frame out of the maximum number of preprocessing frames
-    // We are currently processing that RenderView for.
-    // This is useful to retrieve data index by frame index
-    int m_frameIndex;
 };
 
 typedef QSharedPointer<RenderViewJob> RenderViewJobPtr;