diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-06-17 09:28:29 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-06-17 09:31:03 +0200 |
| commit | 39d74b5b3db328fa32f7b831936d3671d29ff0e3 (patch) | |
| tree | 42a11d40d6d2376701b4d86607ed165f40b2b159 /src/gui | |
| parent | 6657d8b925aa92161398e98418bcb06d67170591 (diff) | |
rhi: Remove reserved and since from the shader classes
Private API, do not bother with these yet.
Change-Id: I77fb8fadee427425759ed42234944b30155db0f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/rhi/qshader.cpp | 1 | ||||
| -rw-r--r-- | src/gui/rhi/qshader_p.h | 3 | ||||
| -rw-r--r-- | src/gui/rhi/qshaderdescription.cpp | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp index 5569aad639..4676ec3f5b 100644 --- a/src/gui/rhi/qshader.cpp +++ b/src/gui/rhi/qshader.cpp @@ -43,7 +43,6 @@ QT_BEGIN_NAMESPACE /*! \class QShader \inmodule QtRhi - \since 5.14 \brief Contains multiple versions of a shader translated to multiple shading languages, together with reflection metadata. diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h index 12a0a26e12..243842a95a 100644 --- a/src/gui/rhi/qshader_p.h +++ b/src/gui/rhi/qshader_p.h @@ -76,7 +76,6 @@ public: private: int m_version = 100; Flags m_flags; - Q_DECL_UNUSED_MEMBER quint64 m_reserved = 0; }; Q_DECLARE_OPERATORS_FOR_FLAGS(QShaderVersion::Flags) @@ -97,7 +96,6 @@ public: private: QByteArray m_shader; QByteArray m_entryPoint; - Q_DECL_UNUSED_MEMBER quint64 m_reserved = 0; }; Q_DECLARE_TYPEINFO(QShaderCode, Q_MOVABLE_TYPE); @@ -182,7 +180,6 @@ private: QShader::Source m_source = QShader::SpirvShader; QShaderVersion m_sourceVersion; QShader::Variant m_sourceVariant = QShader::StandardShader; - Q_DECL_UNUSED_MEMBER quint64 m_reserved = 0; }; Q_DECLARE_TYPEINFO(QShaderKey, Q_MOVABLE_TYPE); diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp index ed549b083f..c2dbbb38fa 100644 --- a/src/gui/rhi/qshaderdescription.cpp +++ b/src/gui/rhi/qshaderdescription.cpp @@ -44,7 +44,6 @@ QT_BEGIN_NAMESPACE /*! \class QShaderDescription \inmodule QtRhi - \since 5.14 \brief Describes the interface of a shader. |