Remove unused data structures

Was used by old node init API

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

2 files changed, 10 insertions, 11 deletions

diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp
index 14350337b..cc49697fd 100644
--- a/src/plugins/renderers/opengl/renderer/renderer.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderer.cpp
@@ -98,6 +98,7 @@
 #include <Qt3DRender/private/renderstateset_p.h>
 #include <Qt3DRender/private/setfence_p.h>
 #include <Qt3DRender/private/qsetfence_p.h>
+#include <Qt3DRender/private/waitfence_p.h>
 
 #include <glbuffer_p.h>
 #include <graphicscontext_p.h>
@@ -1634,8 +1635,8 @@ Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const QVector<Ren
         }
 
         // Wait for fences if needed
-        const QVector<QWaitFenceData> waitFences = renderView->waitFences();
-        for (const QWaitFenceData &waitFence : waitFences) {
+        const QVector<WaitFence::Data> waitFences = renderView->waitFences();
+        for (const auto &waitFence : waitFences) {
             // TO DO
             if (waitFence.handleType != QWaitFence::OpenGLFenceId) {
                 qWarning() << "WaitFence handleType should be OpenGLFenceId when using the Qt 3D OpenGL renderer";
@@ -1645,12 +1646,10 @@ Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const QVector<Ren
             if (fence == nullptr)
                 continue;
 
-            if (waitFence.waitOnCPU) {
-                m_submissionContext->clientWaitSync(fence,
-                                                    waitFence.timeout);
-            } else {
+            if (waitFence.waitOnCPU)
+                m_submissionContext->clientWaitSync(fence, waitFence.timeout);
+            else
                 m_submissionContext->waitSync(fence);
-            }
         }
 
         // Note: the RenderStateSet is allocated once per RV if needed
diff --git a/src/plugins/renderers/opengl/renderer/renderview_p.h b/src/plugins/renderers/opengl/renderer/renderview_p.h
index 9d4e09df3..40e7a77fe 100644
--- a/src/plugins/renderers/opengl/renderer/renderview_p.h
+++ b/src/plugins/renderers/opengl/renderer/renderview_p.h
@@ -64,7 +64,7 @@
 #include <Qt3DRender/private/qmemorybarrier_p.h>
 #include <Qt3DRender/private/qrendercapture_p.h>
 #include <Qt3DRender/private/qblitframebuffer_p.h>
-#include <Qt3DRender/private/qwaitfence_p.h>
+#include <Qt3DRender/private/waitfence_p.h>
 
 #include <Qt3DRender/private/aligned_malloc_p.h>
 
@@ -168,8 +168,8 @@ public:
     // We prefix with get to avoid confusion when it is called
     inline Qt3DCore::QNodeIdVector insertFenceIds() const { return m_insertFenceIds; }
 
-    inline void appendWaitFence(const QWaitFenceData &data) { m_waitFences.push_back(data); }
-    inline QVector<QWaitFenceData> waitFences() const { return m_waitFences; }
+    inline void appendWaitFence(const WaitFence::Data &data) { m_waitFences.push_back(data); }
+    inline QVector<WaitFence::Data> waitFences() const { return m_waitFences; }
 
     inline void setRenderPassFilter(const RenderPassFilter *rpFilter) Q_DECL_NOTHROW { m_data.m_passFilter = rpFilter; }
     inline const RenderPassFilter *renderPassFilter() const Q_DECL_NOTHROW { return m_data.m_passFilter; }
@@ -329,7 +329,7 @@ private:
     int m_workGroups[3];
     QMemoryBarrier::Operations m_memoryBarrier;
     QVector<Qt3DCore::QNodeId> m_insertFenceIds;
-    QVector<QWaitFenceData> m_waitFences;
+    QVector<WaitFence::Data> m_waitFences;
 
     QVector<RenderCommand> m_commands;
     mutable QVector<LightSource> m_lightSources;