Remove unused data structures

Was used by old node init API

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

19 files changed, 10 insertions, 116 deletions

diff --git a/src/render/framegraph/qblitframebuffer_p.h b/src/render/framegraph/qblitframebuffer_p.h
index 8b5dc2165..96820e53f 100644
--- a/src/render/framegraph/qblitframebuffer_p.h
+++ b/src/render/framegraph/qblitframebuffer_p.h
@@ -77,17 +77,6 @@ public:
     Q_DECLARE_PUBLIC(QBlitFramebuffer)
 };
 
-struct QBlitFramebufferData
-{
-    Qt3DCore::QNodeId m_sourceRenderTargetId;
-    Qt3DCore::QNodeId m_destinationRenderTargetId;
-    QRect m_sourceRect;
-    QRect m_destinationRect;
-    Qt3DRender::QRenderTargetOutput::AttachmentPoint m_sourceAttachmentPoint;
-    Qt3DRender::QRenderTargetOutput::AttachmentPoint m_destinationAttachmentPoint;
-    QBlitFramebuffer::InterpolationMethod m_interpolationMethod;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qcameraselector_p.h b/src/render/framegraph/qcameraselector_p.h
index 9e30a541b..050fb2b1a 100644
--- a/src/render/framegraph/qcameraselector_p.h
+++ b/src/render/framegraph/qcameraselector_p.h
@@ -69,11 +69,6 @@ public:
     Qt3DCore::QEntity *m_camera;
 };
 
-struct QCameraSelectorData
-{
-    Qt3DCore::QNodeId cameraId;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qclearbuffers_p.h b/src/render/framegraph/qclearbuffers_p.h
index 55e7d2f84..e4dd474d8 100644
--- a/src/render/framegraph/qclearbuffers_p.h
+++ b/src/render/framegraph/qclearbuffers_p.h
@@ -71,15 +71,6 @@ public:
     QRenderTargetOutput *m_buffer;
 };
 
-struct QClearBuffersData
-{
-    QClearBuffers::BufferType buffersType;
-    QColor clearColor;
-    float clearDepthValue;
-    int clearStencilValue;
-    Qt3DCore::QNodeId bufferId;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qdispatchcompute_p.h b/src/render/framegraph/qdispatchcompute_p.h
index d64f2655f..3eb294674 100644
--- a/src/render/framegraph/qdispatchcompute_p.h
+++ b/src/render/framegraph/qdispatchcompute_p.h
@@ -69,13 +69,6 @@ public:
     int m_workGroupZ;
 };
 
-struct QDispatchComputeData
-{
-    int workGroupX;
-    int workGroupY;
-    int workGroupZ;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qlayerfilter_p.h b/src/render/framegraph/qlayerfilter_p.h
index 97469bda0..ded2ed71e 100644
--- a/src/render/framegraph/qlayerfilter_p.h
+++ b/src/render/framegraph/qlayerfilter_p.h
@@ -70,12 +70,6 @@ public:
     QLayerFilter::FilterMode m_filterMode;
 };
 
-struct QLayerFilterData
-{
-    Qt3DCore::QNodeIdVector layerIds;
-    QLayerFilter::FilterMode filterMode;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qmemorybarrier_p.h b/src/render/framegraph/qmemorybarrier_p.h
index 384dbee3d..38e9ecc5e 100644
--- a/src/render/framegraph/qmemorybarrier_p.h
+++ b/src/render/framegraph/qmemorybarrier_p.h
@@ -66,11 +66,6 @@ public:
     QMemoryBarrier::Operations m_waitOperations;
 };
 
-struct QMemoryBarrierData
-{
-    QMemoryBarrier::Operations waitOperations;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qproximityfilter_p.h b/src/render/framegraph/qproximityfilter_p.h
index 8f8bba800..0bbc9c0fb 100644
--- a/src/render/framegraph/qproximityfilter_p.h
+++ b/src/render/framegraph/qproximityfilter_p.h
@@ -69,12 +69,6 @@ public:
     float m_distanceThreshold;
 };
 
-struct QProximityFilterData
-{
-    Qt3DCore::QNodeId entityId;
-    float distanceThreshold;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrendercapture_p.h b/src/render/framegraph/qrendercapture_p.h
index 3dec4d280..7c6577524 100644
--- a/src/render/framegraph/qrendercapture_p.h
+++ b/src/render/framegraph/qrendercapture_p.h
@@ -93,12 +93,6 @@ public:
     Q_DECLARE_PUBLIC(QRenderCaptureReply)
 };
 
-// used by initializeFromPeer
-struct QRenderCaptureInitData
-{
-    int captureId;
-};
-
 // used by backend to send render capture to frontend
 struct RenderCaptureData
 {
diff --git a/src/render/framegraph/qrenderpassfilter_p.h b/src/render/framegraph/qrenderpassfilter_p.h
index d4b68eaba..1a6d74bb9 100644
--- a/src/render/framegraph/qrenderpassfilter_p.h
+++ b/src/render/framegraph/qrenderpassfilter_p.h
@@ -72,12 +72,6 @@ public:
     QVector<QParameter *> m_parameters;
 };
 
-struct QRenderPassFilterData
-{
-    Qt3DCore::QNodeIdVector matchIds;
-    Qt3DCore::QNodeIdVector parameterIds;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrenderstateset_p.h b/src/render/framegraph/qrenderstateset_p.h
index 2ac1db467..192d807c2 100644
--- a/src/render/framegraph/qrenderstateset_p.h
+++ b/src/render/framegraph/qrenderstateset_p.h
@@ -69,11 +69,6 @@ public:
     QVector<QRenderState *> m_renderStates;
 };
 
-struct QRenderStateSetData
-{
-    Qt3DCore::QNodeIdVector renderStateIds;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrendersurfaceselector_p.h b/src/render/framegraph/qrendersurfaceselector_p.h
index 70fdc5881..df3fb0b7f 100644
--- a/src/render/framegraph/qrendersurfaceselector_p.h
+++ b/src/render/framegraph/qrendersurfaceselector_p.h
@@ -85,13 +85,6 @@ public:
     QMetaObject::Connection m_screenConn;
 };
 
-struct QRenderSurfaceSelectorData
-{
-    QPointer<QObject> surface;
-    QSize externalRenderTargetSize;
-    float surfacePixelRatio;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrendertargetselector_p.h b/src/render/framegraph/qrendertargetselector_p.h
index be3ebea1c..2130a06a2 100644
--- a/src/render/framegraph/qrendertargetselector_p.h
+++ b/src/render/framegraph/qrendertargetselector_p.h
@@ -70,12 +70,6 @@ public:
     QVector<QRenderTargetOutput::AttachmentPoint> m_outputs;
 };
 
-struct QRenderTargetSelectorData
-{
-    Qt3DCore::QNodeId targetId;
-    QVector<QRenderTargetOutput::AttachmentPoint> outputs;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qsetfence_p.h b/src/render/framegraph/qsetfence_p.h
index 2a929bde6..3c94c4a5e 100644
--- a/src/render/framegraph/qsetfence_p.h
+++ b/src/render/framegraph/qsetfence_p.h
@@ -72,10 +72,6 @@ public:
     Q_DECLARE_PUBLIC(QSetFence)
 };
 
-struct QSetFenceData
-{
-};
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qsortpolicy_p.h b/src/render/framegraph/qsortpolicy_p.h
index 484f7a206..796a4f7f0 100644
--- a/src/render/framegraph/qsortpolicy_p.h
+++ b/src/render/framegraph/qsortpolicy_p.h
@@ -67,12 +67,6 @@ public:
     QVector<QSortPolicy::SortType> m_sortTypes;
 };
 
-
-struct QSortPolicyData
-{
-    QVector<QSortPolicy::SortType> sortTypes;
-};
-
 } // namespace Qt3DRender
 
 namespace {
diff --git a/src/render/framegraph/qsubtreeenabler_p.h b/src/render/framegraph/qsubtreeenabler_p.h
index 72354fe89..88a1e2761 100644
--- a/src/render/framegraph/qsubtreeenabler_p.h
+++ b/src/render/framegraph/qsubtreeenabler_p.h
@@ -68,11 +68,6 @@ public:
     Q_DECLARE_PUBLIC(QSubtreeEnabler)
 };
 
-struct QSubtreeEnablerData
-{
-    QSubtreeEnabler::Enablement enablement;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qtechniquefilter_p.h b/src/render/framegraph/qtechniquefilter_p.h
index 10df8f5bf..7ab6789fb 100644
--- a/src/render/framegraph/qtechniquefilter_p.h
+++ b/src/render/framegraph/qtechniquefilter_p.h
@@ -70,12 +70,6 @@ public :
     QVector<QParameter *> m_parameters;
 };
 
-struct QTechniqueFilterData
-{
-    Qt3DCore::QNodeIdVector matchIds;
-    Qt3DCore::QNodeIdVector parameterIds;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qviewport_p.h b/src/render/framegraph/qviewport_p.h
index 4c82f38b3..4ad3ce072 100644
--- a/src/render/framegraph/qviewport_p.h
+++ b/src/render/framegraph/qviewport_p.h
@@ -70,12 +70,6 @@ public :
     float m_gamma;
 };
 
-struct QViewportData
-{
-    QRectF normalizedRect;
-    float gamma;
-};
-
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/qwaitfence_p.h b/src/render/framegraph/qwaitfence_p.h
index 480d69cad..f54e9ae25 100644
--- a/src/render/framegraph/qwaitfence_p.h
+++ b/src/render/framegraph/qwaitfence_p.h
@@ -69,14 +69,6 @@ public:
     quint64 m_timeout;
 };
 
-struct QWaitFenceData
-{
-    QWaitFence::HandleType handleType;
-    QVariant handle;
-    bool waitOnCPU;
-    quint64 timeout;
-};
-
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/framegraph/waitfence_p.h b/src/render/framegraph/waitfence_p.h
index 811fc80a2..e8fd79044 100644
--- a/src/render/framegraph/waitfence_p.h
+++ b/src/render/framegraph/waitfence_p.h
@@ -67,11 +67,19 @@ public:
     WaitFence();
     ~WaitFence();
 
-    inline QWaitFenceData data() const { return m_data; }
+    struct Data
+    {
+        QWaitFence::HandleType handleType;
+        QVariant handle;
+        bool waitOnCPU;
+        quint64 timeout;
+    };
+
+    inline Data data() const { return m_data; }
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
 private:
-    QWaitFenceData m_data;
+    Data m_data;
 };
 
 } // namespace Render