diff options
author | Jean-Michaƫl Celerier <jean-michael.celerier@kdab.com> | 2019-12-26 17:55:20 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-03-16 15:38:59 +0000 |
commit | 2f3145d14cf9c13eca96776a05754699e1151678 (patch) | |
tree | 831b3ac7a0b9a71e217919bc98cb60782e0b4613 /src/render/renderstates | |
parent | 8b122b9b53687285953140b2130be6541a938737 (diff) |
Initial creation of RHI plug-in and refactoring
Change-Id: Ifbb51003e15f798798040597b5f7224641e8147c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/renderstates')
-rw-r--r-- | src/render/renderstates/qblendequationarguments.h | 4 | ||||
-rw-r--r-- | src/render/renderstates/renderstateset.cpp | 2 | ||||
-rw-r--r-- | src/render/renderstates/renderstateset_p.h | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/render/renderstates/qblendequationarguments.h b/src/render/renderstates/qblendequationarguments.h index e454dbae5..4c881c3ae 100644 --- a/src/render/renderstates/qblendequationarguments.h +++ b/src/render/renderstates/qblendequationarguments.h @@ -66,8 +66,8 @@ public: One = 1, SourceColor = 0x0300, SourceAlpha = 0x0302, - Source1Alpha, - Source1Color, + Source1Alpha, // ### Qt 6: Fix -> has same value as OneMinusSourceAlpha + Source1Color, // ### Qt 6: Fix -> has same value as DestinationAlpha DestinationColor = 0x0306, DestinationAlpha = 0x0304, SourceAlphaSaturate = 0x0308, diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp index 6b66d2dd7..5b9c4e8b5 100644 --- a/src/render/renderstates/renderstateset.cpp +++ b/src/render/renderstates/renderstateset.cpp @@ -102,7 +102,7 @@ StateMaskSet RenderStateSet::stateMask() const // This modifies our state to add states from others // if we don't already contain a state with that type set -void RenderStateSet::merge(RenderStateSet *other) +void RenderStateSet::merge(const RenderStateSet *other) { m_stateMask |= other->stateMask(); const QVector<StateVariant> otherStates = other->states(); diff --git a/src/render/renderstates/renderstateset_p.h b/src/render/renderstates/renderstateset_p.h index 119f1edca..667c2614d 100644 --- a/src/render/renderstates/renderstateset_p.h +++ b/src/render/renderstates/renderstateset_p.h @@ -89,9 +89,10 @@ public: int changeCost(RenderStateSet* previousState); StateMaskSet stateMask() const; - void merge(RenderStateSet *other); + void merge(const RenderStateSet *other); - QVector<StateVariant> states() const { return m_states; } + const QVector<StateVariant>& states() const noexcept { return m_states; } + QVector<StateVariant>& states() noexcept { return m_states; } bool canAddStateOfType(StateMask type) const; |