diff options
author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 12:57:38 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-17 11:25:16 +0000 |
commit | c01bc22c287e58186a285b3f8507711fd982fd05 (patch) | |
tree | 77a5b100d5a02de3cf864672590cdde5d4099301 /examples/qt3d/shadow-map-qml | |
parent | a8371dccd60a097678239edc510e5bb4624b52b8 (diff) |
QAnnotation changes
Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/shadow-map-qml')
-rw-r--r-- | examples/qt3d/shadow-map-qml/AdsEffect.qml | 8 | ||||
-rw-r--r-- | examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml index 01ca38639..9bc81bf4c 100644 --- a/examples/qt3d/shadow-map-qml/AdsEffect.qml +++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml @@ -84,7 +84,7 @@ Effect { renderPasses: [ RenderPass { - annotations: [ Annotation { name: "pass"; value: "shadowmap" } ] + filterKeys: [ FilterKey { name: "pass"; value: "shadowmap" } ] shaderProgram: ShaderProgram { vertexShaderCode: loadSource("qrc:/shaders/shadowmap.vert") @@ -98,7 +98,7 @@ Effect { }, RenderPass { - annotations: [ Annotation { name : "pass"; value : "forward" } ] + filterKeys: [ FilterKey { name : "pass"; value : "forward" } ] shaderProgram: ShaderProgram { vertexShaderCode: loadSource("qrc:/shaders/ads.vert") @@ -118,7 +118,7 @@ Effect { renderPasses: [ RenderPass { - annotations: [ Annotation { name: "pass"; value: "shadowmap" } ] + filterKeys: [ FilterKey { name: "pass"; value: "shadowmap" } ] shaderProgram: ShaderProgram { vertexShaderCode: loadSource("qrc:/shaders/es3/shadowmap.vert") @@ -132,7 +132,7 @@ Effect { }, RenderPass { - annotations: [ Annotation { name : "pass"; value : "forward" } ] + filterKeys: [ FilterKey { name : "pass"; value : "forward" } ] shaderProgram: ShaderProgram { vertexShaderCode: loadSource("qrc:/shaders/es3/ads.vert") diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index afccb2082..2a510b40b 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -65,7 +65,7 @@ RenderSettings { RenderSurfaceSelector { RenderPassFilter { - includes: [ Annotation { name: "pass"; value: "shadowmap" } ] + includes: [ FilterKey { name: "pass"; value: "shadowmap" } ] RenderTargetSelector { target: RenderTarget { @@ -102,8 +102,8 @@ RenderSettings { } } - RenderPassFilter { - includes: [ Annotation { name: "pass"; value: "forward" } ] + RenderPassFilter { + includes: [ FilterKey { name: "pass"; value: "forward" } ] ClearBuffer { buffers: ClearBuffer.ColorDepthBuffer |