summaryrefslogtreecommitdiffstats
path: root/src/render/framegraph
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/framegraph')
-rw-r--r--src/render/framegraph/qrenderpassfilter.cpp9
-rw-r--r--src/render/framegraph/qtechniquefilter.cpp10
2 files changed, 12 insertions, 7 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.
*/
/*!
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 5377e1297..2149d147e 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -65,8 +65,9 @@ QTechniqueFilterPrivate::QTechniqueFilterPrivate()
a list of Qt3DRender::QFilterKey objects and Qt3DRender::QParameter objects.
When QTechniqueFilter is present in the FrameGraph, only the techiques matching
the keys in the list are used for rendering. The parameters in the list can be used
- to set values for shader parameters. The parameters in QTechniqueFilter are
- overridden by parameters in QTechnique and QRenderPass.
+ to set values for shader parameters. The parameters in QTechniqueFilter
+ override parameters in QMaterial, QEffect, QTechnique and QRenderPass, but are overridden
+ by parameters in QRenderPassFilter.
*/
/*!
@@ -82,8 +83,9 @@ QTechniqueFilterPrivate::QTechniqueFilterPrivate()
a list of FilterKey objects and Parameter objects.
When TechniqueFilter is present in the FrameGraph, only the techiques matching
the keys in list are used for rendering. The parameters in the list can be used
- to set values for shader parameters. The parameters in TechniqueFilter are
- overridden by parameters in Technique and RenderPass.
+ to set values for shader parameters. The parameters in TechniqueFilter
+ override parameters in Material, Effect, Technique and RenderPass, but are overridden
+ by parameters in RenderPassFilter.
*/
/*!