diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-30 16:00:24 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-31 11:55:27 +0100 |
commit | 963cbbaa420b12e810d23820b78f73c3eaaa15a8 (patch) | |
tree | b9f9fd1284560b5dfaf9b3cf650c775fa1c8083a /src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | |
parent | 3019b82b1b9813b7d23ebc74a40e437cecd60a60 (diff) |
Replace old Q_DECL statements with modern C++
Since we depend on C++17 now, all of these can go.
Change-Id: I0484fd4bb99e4367ec211c29146c316453729959
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index 636b06dfa0..903a98c8ed 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -3889,7 +3889,7 @@ void Renderer::invalidatePipelineCacheDependency(QRhiRenderPassDescriptor *rpDes } } -bool operator==(const GraphicsState &a, const GraphicsState &b) Q_DECL_NOTHROW +bool operator==(const GraphicsState &a, const GraphicsState &b) noexcept { return a.depthTest == b.depthTest && a.depthWrite == b.depthWrite @@ -3906,12 +3906,12 @@ bool operator==(const GraphicsState &a, const GraphicsState &b) Q_DECL_NOTHROW && a.lineWidth == b.lineWidth; } -bool operator!=(const GraphicsState &a, const GraphicsState &b) Q_DECL_NOTHROW +bool operator!=(const GraphicsState &a, const GraphicsState &b) noexcept { return !(a == b); } -size_t qHash(const GraphicsState &s, size_t seed) Q_DECL_NOTHROW +size_t qHash(const GraphicsState &s, size_t seed) noexcept { // do not bother with all fields return seed @@ -3926,7 +3926,7 @@ size_t qHash(const GraphicsState &s, size_t seed) Q_DECL_NOTHROW + s.sampleCount; } -bool operator==(const GraphicsPipelineStateKey &a, const GraphicsPipelineStateKey &b) Q_DECL_NOTHROW +bool operator==(const GraphicsPipelineStateKey &a, const GraphicsPipelineStateKey &b) noexcept { return a.state == b.state && a.sms->programRhi.program == b.sms->programRhi.program @@ -3934,12 +3934,12 @@ bool operator==(const GraphicsPipelineStateKey &a, const GraphicsPipelineStateKe && a.layoutCompatibleSrb->isLayoutCompatible(b.layoutCompatibleSrb); } -bool operator!=(const GraphicsPipelineStateKey &a, const GraphicsPipelineStateKey &b) Q_DECL_NOTHROW +bool operator!=(const GraphicsPipelineStateKey &a, const GraphicsPipelineStateKey &b) noexcept { return !(a == b); } -size_t qHash(const GraphicsPipelineStateKey &k, size_t seed) Q_DECL_NOTHROW +size_t qHash(const GraphicsPipelineStateKey &k, size_t seed) noexcept { // no srb and rp included due to their special comparison semantics and lack of hash keys return qHash(k.state, seed) + qHash(k.sms->programRhi.program, seed); |