diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2021-01-14 16:03:22 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-01-18 12:23:57 +0000 |
| commit | c7a4ae428cb033e9497a2b175a351f274ffacd0a (patch) | |
| tree | 1ed921e6362b09e6d372222987a8d6f7a966c685 /src/render/framegraph/qrenderpassfilter.cpp | |
| parent | 3b8ef584594048514645bc818ab5dd43cf882fe1 (diff) | |
Fix parameter priorization documentation
Fixes: QTBUG-64110
Change-Id: I09330ba29b0c120d6e7e0ae0b2bf8d4e388054e1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 9c6563c780eef3890c83b82ebbb0ebf271fb6897)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/render/framegraph/qrenderpassfilter.cpp')
| -rw-r--r-- | src/render/framegraph/qrenderpassfilter.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 34462ebdf..f7fafb7d1 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -63,8 +63,8 @@ namespace Qt3DRender { whose Qt3DRender::QFilterKey objects match the keys in QRenderPassFilter are selected for rendering. If no QRenderPassFilter is present, then all QRenderPass objects are selected for rendering. The parameters in the list can be used - to set values for shader parameters. The parameters in QRenderPassFilter are - overridden by parameters in QTechniqueFilter, QTechnique and QRenderPass. + to set values for shader parameters. The parameters in QRenderPassFilter + override parameters in QTechniqueFilter, QMaterial, QEffect, QTechnique and QRenderPass. */ /*! @@ -79,7 +79,10 @@ namespace Qt3DRender { objects are selected for drawing. When RenderPassFilter is present in the FrameGraph, only the RenderPass objects, whose FilterKey objects match the keys in RenderPassFilter are selected for rendering. If no RenderPassFilter is present, - then all RenderPass objects are selected for rendering. + then all RenderPass objects are selected for rendering. RenderPassFilter + specifies a list of Parameter objects. The parameters in the list can be used + to set values for shader parameters. The parameters in RenderPassFilter + override parameters in TechniqueFilter, Material, Effect, Technique and RenderPass. */ /*! |