diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/rhi/qrhi_p.h | 8 | ||||
-rw-r--r-- | src/gui/rhi/qrhi_p_p.h | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/gui/rhi/qrhi_p.h b/src/gui/rhi/qrhi_p.h index acd04f299c..17b170203b 100644 --- a/src/gui/rhi/qrhi_p.h +++ b/src/gui/rhi/qrhi_p.h @@ -284,8 +284,6 @@ private: friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiVertexInputLayout &); }; -Q_DECLARE_TYPEINFO(QRhiVertexInputLayout, Q_RELOCATABLE_TYPE); - Q_GUI_EXPORT bool operator==(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) noexcept; Q_GUI_EXPORT bool operator!=(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) noexcept; Q_GUI_EXPORT size_t qHash(const QRhiVertexInputLayout &v, size_t seed = 0) noexcept; @@ -526,8 +524,6 @@ private: QRhiTexture *m_depthTexture = nullptr; }; -Q_DECLARE_TYPEINFO(QRhiTextureRenderTargetDescription, Q_RELOCATABLE_TYPE); - class Q_GUI_EXPORT QRhiTextureSubresourceUploadDescription { public: @@ -609,8 +605,6 @@ private: QVarLengthArray<QRhiTextureUploadEntry, 16> m_entries; }; -Q_DECLARE_TYPEINFO(QRhiTextureUploadDescription, Q_RELOCATABLE_TYPE); - class Q_GUI_EXPORT QRhiTextureCopyDescription { public: @@ -1470,7 +1464,7 @@ struct Q_GUI_EXPORT QRhiReadbackResult QRhiTexture::Format format; QSize pixelSize; QByteArray data; -}; // non-movable due to the std::function +}; struct Q_GUI_EXPORT QRhiBufferReadbackResult { diff --git a/src/gui/rhi/qrhi_p_p.h b/src/gui/rhi/qrhi_p_p.h index 89dd7b8e44..0dcb8c1f6e 100644 --- a/src/gui/rhi/qrhi_p_p.h +++ b/src/gui/rhi/qrhi_p_p.h @@ -519,9 +519,6 @@ public: static QRhiResourceUpdateBatchPrivate *get(QRhiResourceUpdateBatch *b) { return b->d; } }; -Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::BufferOp, Q_RELOCATABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::TextureOp, Q_RELOCATABLE_TYPE); - template<typename T> struct QRhiBatchedBindings { |