summaryrefslogtreecommitdiffstats
path: root/src/render/renderstates
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-01-22 17:57:49 +0000
committerMike Krus <mike.krus@kdab.com>2020-02-11 09:18:09 +0000
commitc86ffa60f07d7ee77f835ad4d8383b599dd9886e (patch)
tree671fcff27cca7cb59e845f6f3606b978d50087a4 /src/render/renderstates
parentde168482e6acb4201d369b49b0b71ae0865a6470 (diff)
Remove unused data structures
Was used by old node init API Change-Id: I7b68f25634ee7aaccefab6f499ac074fcfb9a7f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/renderstates')
-rw-r--r--src/render/renderstates/qblendequationarguments_p.h9
-rw-r--r--src/render/renderstates/qclipplane_p.h7
-rw-r--r--src/render/renderstates/qcolormask_p.h8
-rw-r--r--src/render/renderstates/qcullface_p.h5
-rw-r--r--src/render/renderstates/qdepthrange_p.h6
-rw-r--r--src/render/renderstates/qdepthtest_p.h5
-rw-r--r--src/render/renderstates/qfrontface_p.h5
-rw-r--r--src/render/renderstates/qlinewidth_p.h6
-rw-r--r--src/render/renderstates/qpointsize_p.h6
-rw-r--r--src/render/renderstates/qpolygonoffset_p.h6
-rw-r--r--src/render/renderstates/qrastermode_p.h6
-rw-r--r--src/render/renderstates/qscissortest_p.h8
-rw-r--r--src/render/renderstates/qstencilmask_p.h6
-rw-r--r--src/render/renderstates/qstenciloperation.cpp2
-rw-r--r--src/render/renderstates/qstenciloperation_p.h1
-rw-r--r--src/render/renderstates/qstenciloperationarguments.cpp2
-rw-r--r--src/render/renderstates/qstenciloperationarguments_p.h1
17 files changed, 6 insertions, 83 deletions
diff --git a/src/render/renderstates/qblendequationarguments_p.h b/src/render/renderstates/qblendequationarguments_p.h
index d2aae69c7..e30449519 100644
--- a/src/render/renderstates/qblendequationarguments_p.h
+++ b/src/render/renderstates/qblendequationarguments_p.h
@@ -78,15 +78,6 @@ public:
int m_bufferIndex;
};
-struct QBlendEquationArgumentsData
-{
- QBlendEquationArguments::Blending sourceRgb;
- QBlendEquationArguments::Blending sourceAlpha;
- QBlendEquationArguments::Blending destinationRgb;
- QBlendEquationArguments::Blending destinationAlpha;
- int bufferIndex;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qclipplane_p.h b/src/render/renderstates/qclipplane_p.h
index 9c59675c6..c75e4dddc 100644
--- a/src/render/renderstates/qclipplane_p.h
+++ b/src/render/renderstates/qclipplane_p.h
@@ -71,13 +71,6 @@ public:
float m_distance;
};
-struct QClipPlaneData
-{
- QVector3D normal;
- float distance;
- int planeIndex;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qcolormask_p.h b/src/render/renderstates/qcolormask_p.h
index bd041de3b..2a37b0a35 100644
--- a/src/render/renderstates/qcolormask_p.h
+++ b/src/render/renderstates/qcolormask_p.h
@@ -74,14 +74,6 @@ public:
Q_DECLARE_PUBLIC(QColorMask)
};
-struct QColorMaskData
-{
- bool redMasked;
- bool greenMasked;
- bool blueMasked;
- bool alphaMasked;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qcullface_p.h b/src/render/renderstates/qcullface_p.h
index fd85b27a7..d29bb7461 100644
--- a/src/render/renderstates/qcullface_p.h
+++ b/src/render/renderstates/qcullface_p.h
@@ -69,11 +69,6 @@ public:
QCullFace::CullingMode m_mode;
};
-struct QCullFaceData
-{
- QCullFace::CullingMode mode;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qdepthrange_p.h b/src/render/renderstates/qdepthrange_p.h
index 43eeeb4c7..e85dbcda2 100644
--- a/src/render/renderstates/qdepthrange_p.h
+++ b/src/render/renderstates/qdepthrange_p.h
@@ -72,12 +72,6 @@ public:
double m_farValue;
};
-struct QDepthRangeData
-{
- double nearValue;
- double farValue;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qdepthtest_p.h b/src/render/renderstates/qdepthtest_p.h
index 82689a50f..200293d61 100644
--- a/src/render/renderstates/qdepthtest_p.h
+++ b/src/render/renderstates/qdepthtest_p.h
@@ -69,11 +69,6 @@ public :
QDepthTest::DepthFunction m_depthFunction;
};
-struct QDepthTestData
-{
- QDepthTest::DepthFunction depthFunction;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qfrontface_p.h b/src/render/renderstates/qfrontface_p.h
index 605e78196..03ebbfe4f 100644
--- a/src/render/renderstates/qfrontface_p.h
+++ b/src/render/renderstates/qfrontface_p.h
@@ -69,11 +69,6 @@ public:
QFrontFace::WindingDirection m_direction;
};
-struct QFrontFaceData
-{
- QFrontFace::WindingDirection direction;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qlinewidth_p.h b/src/render/renderstates/qlinewidth_p.h
index bffa9ac1e..abacf5235 100644
--- a/src/render/renderstates/qlinewidth_p.h
+++ b/src/render/renderstates/qlinewidth_p.h
@@ -70,12 +70,6 @@ public:
Q_DECLARE_PUBLIC(QLineWidth)
};
-struct QLineWidthData
-{
- float value;
- bool smooth;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qpointsize_p.h b/src/render/renderstates/qpointsize_p.h
index fab7baf30..00ea1bebb 100644
--- a/src/render/renderstates/qpointsize_p.h
+++ b/src/render/renderstates/qpointsize_p.h
@@ -71,12 +71,6 @@ public:
Q_DECLARE_PUBLIC(QPointSize)
};
-struct QPointSizeData
-{
- QPointSize::SizeMode sizeMode;
- float value;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qpolygonoffset_p.h b/src/render/renderstates/qpolygonoffset_p.h
index 11edaf445..60f760483 100644
--- a/src/render/renderstates/qpolygonoffset_p.h
+++ b/src/render/renderstates/qpolygonoffset_p.h
@@ -72,12 +72,6 @@ public:
Q_DECLARE_PUBLIC(QPolygonOffset)
};
-struct QPolygonOffsetData
-{
- float scaleFactor;
- float depthSteps;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qrastermode_p.h b/src/render/renderstates/qrastermode_p.h
index 2e8e790de..2a0922bd4 100644
--- a/src/render/renderstates/qrastermode_p.h
+++ b/src/render/renderstates/qrastermode_p.h
@@ -71,12 +71,6 @@ public :
QRasterMode::FaceMode m_faceMode;
};
-struct QRasterModeData
-{
- QRasterMode::FaceMode faceMode;
- QRasterMode::RasterMode rasterMode;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qscissortest_p.h b/src/render/renderstates/qscissortest_p.h
index eebf3c326..f8102274b 100644
--- a/src/render/renderstates/qscissortest_p.h
+++ b/src/render/renderstates/qscissortest_p.h
@@ -75,14 +75,6 @@ public:
int m_height;
};
-struct QScissorTestData
-{
- int left;
- int bottom;
- int width;
- int height;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qstencilmask_p.h b/src/render/renderstates/qstencilmask_p.h
index c9af3d7f1..9cb2a8a53 100644
--- a/src/render/renderstates/qstencilmask_p.h
+++ b/src/render/renderstates/qstencilmask_p.h
@@ -69,12 +69,6 @@ public:
uint m_backOutputMask;
};
-struct QStencilMaskData
-{
- uint frontOutputMask;
- uint backOutputMask;
-};
-
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qstenciloperation.cpp b/src/render/renderstates/qstenciloperation.cpp
index d0eef1f6c..720de88a9 100644
--- a/src/render/renderstates/qstenciloperation.cpp
+++ b/src/render/renderstates/qstenciloperation.cpp
@@ -45,6 +45,8 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
+QStencilOperationPrivate::~QStencilOperationPrivate() = default;
+
/*!
\class Qt3DRender::QStencilOperation
\brief The QStencilOperation class specifies stencil operation.
diff --git a/src/render/renderstates/qstenciloperation_p.h b/src/render/renderstates/qstenciloperation_p.h
index d38abf0d7..51c17c765 100644
--- a/src/render/renderstates/qstenciloperation_p.h
+++ b/src/render/renderstates/qstenciloperation_p.h
@@ -72,6 +72,7 @@ public:
, m_front(new QStencilOperationArguments(QStencilOperationArguments::Front, q_ptr))
, m_back(new QStencilOperationArguments(QStencilOperationArguments::Back, q_ptr))
{}
+ ~QStencilOperationPrivate();
QStencilOperationArguments *m_front;
QStencilOperationArguments *m_back;
diff --git a/src/render/renderstates/qstenciloperationarguments.cpp b/src/render/renderstates/qstenciloperationarguments.cpp
index f5d0c1f4f..d062203f5 100644
--- a/src/render/renderstates/qstenciloperationarguments.cpp
+++ b/src/render/renderstates/qstenciloperationarguments.cpp
@@ -44,6 +44,8 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
+QStencilOperationArgumentsPrivate::~QStencilOperationArgumentsPrivate() = default;
+
/*!
\class Qt3DRender::QStencilOperationArguments
\brief The QStencilOperationArguments class sets the actions to be taken
diff --git a/src/render/renderstates/qstenciloperationarguments_p.h b/src/render/renderstates/qstenciloperationarguments_p.h
index b24ddf09d..1370261b5 100644
--- a/src/render/renderstates/qstenciloperationarguments_p.h
+++ b/src/render/renderstates/qstenciloperationarguments_p.h
@@ -68,6 +68,7 @@ public:
{
}
+ ~QStencilOperationArgumentsPrivate();
QStencilOperationArguments::FaceMode m_face;
QStencilOperationArguments::Operation m_stencilTestFailureOperation;