diff options
| author | Laszlo Agocs <[email protected]> | 2022-09-22 10:44:39 +0200 |
|---|---|---|
| committer | Laszlo Agocs <[email protected]> | 2022-09-26 16:53:08 +0200 |
| commit | 2afb9fe157ff7ead678f1b29f3c2955e277e7d1c (patch) | |
| tree | a9269aff68f2865dee7eb75cc5443d837ab9e3fe /src/quickshapes/qquickshapegenericrenderer.cpp | |
| parent | ef97bf04af96980004cd1476b7ffc964be1be165 (diff) | |
Fix casts in qquickshapegenericrenderer
Works anyway because the data layout (a single m_node member) is the same
for all the materials, but let's correct the casts.
Pick-to: 6.4 6.3 6.2
Fixes: QTBUG-106824
Change-Id: I84038b04ca03339bdefc61d5780b35309fcf6670
Reviewed-by: Andy Nichols <[email protected]>
Diffstat (limited to 'src/quickshapes/qquickshapegenericrenderer.cpp')
| -rw-r--r-- | src/quickshapes/qquickshapegenericrenderer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quickshapes/qquickshapegenericrenderer.cpp b/src/quickshapes/qquickshapegenericrenderer.cpp index 470e5e9641..4f32609d44 100644 --- a/src/quickshapes/qquickshapegenericrenderer.cpp +++ b/src/quickshapes/qquickshapegenericrenderer.cpp @@ -807,7 +807,7 @@ bool QQuickShapeRadialGradientRhiShader::updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) { Q_ASSERT(oldMaterial == nullptr || newMaterial->type() == oldMaterial->type()); - QQuickShapeLinearGradientMaterial *m = static_cast<QQuickShapeLinearGradientMaterial *>(newMaterial); + QQuickShapeRadialGradientMaterial *m = static_cast<QQuickShapeRadialGradientMaterial *>(newMaterial); bool changed = false; QByteArray *buf = state.uniformData(); Q_ASSERT(buf->size() >= 92); @@ -867,7 +867,7 @@ void QQuickShapeRadialGradientRhiShader::updateSampledImage(RenderState &state, if (binding != 1) return; - QQuickShapeLinearGradientMaterial *m = static_cast<QQuickShapeLinearGradientMaterial *>(newMaterial); + QQuickShapeRadialGradientMaterial *m = static_cast<QQuickShapeRadialGradientMaterial *>(newMaterial); QQuickShapeGenericStrokeFillNode *node = m->node(); const QQuickShapeGradientCacheKey cacheKey(node->m_fillGradient.stops, node->m_fillGradient.spread); QSGTexture *t = QQuickShapeGradientCache::cacheForRhi(state.rhi())->get(cacheKey); @@ -941,7 +941,7 @@ bool QQuickShapeConicalGradientRhiShader::updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) { Q_ASSERT(oldMaterial == nullptr || newMaterial->type() == oldMaterial->type()); - QQuickShapeLinearGradientMaterial *m = static_cast<QQuickShapeLinearGradientMaterial *>(newMaterial); + QQuickShapeConicalGradientMaterial *m = static_cast<QQuickShapeConicalGradientMaterial *>(newMaterial); bool changed = false; QByteArray *buf = state.uniformData(); Q_ASSERT(buf->size() >= 80); @@ -985,7 +985,7 @@ void QQuickShapeConicalGradientRhiShader::updateSampledImage(RenderState &state, if (binding != 1) return; - QQuickShapeLinearGradientMaterial *m = static_cast<QQuickShapeLinearGradientMaterial *>(newMaterial); + QQuickShapeConicalGradientMaterial *m = static_cast<QQuickShapeConicalGradientMaterial *>(newMaterial); QQuickShapeGenericStrokeFillNode *node = m->node(); const QQuickShapeGradientCacheKey cacheKey(node->m_fillGradient.stops, node->m_fillGradient.spread); QSGTexture *t = QQuickShapeGradientCache::cacheForRhi(state.rhi())->get(cacheKey); |