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 /tests/benchmarks | |
| parent | a8371dccd60a097678239edc510e5bb4624b52b8 (diff) | |
QAnnotation changes
Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml | 4 | ||||
| -rw-r--r-- | tests/benchmarks/Qt3DBench/ShadowEffect.qml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml b/tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml index 23cf77940..7963f4360 100644 --- a/tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml +++ b/tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml @@ -42,7 +42,7 @@ FrameGraph { clearColor: Qt.rgba(0.0, 0.0, 0.0, 1.0) RenderPassFilter { - includes: [ Annotation { name: "pass"; value: "shadowmap" } ] + includes: [ FilterKey { name: "pass"; value: "shadowmap" } ] RenderTargetSelector { target: RenderTarget { @@ -80,7 +80,7 @@ FrameGraph { } RenderPassFilter { - includes: [ Annotation { name: "pass"; value: "forward" } ] + includes: [ FilterKey { name: "pass"; value: "forward" } ] ClearBuffer { buffers : ClearBuffer.ColorDepthBuffer diff --git a/tests/benchmarks/Qt3DBench/ShadowEffect.qml b/tests/benchmarks/Qt3DBench/ShadowEffect.qml index 12d69d4ae..f1f39cfb4 100644 --- a/tests/benchmarks/Qt3DBench/ShadowEffect.qml +++ b/tests/benchmarks/Qt3DBench/ShadowEffect.qml @@ -47,7 +47,7 @@ Effect { Technique { renderPasses: [ RenderPass { - annotations: [ Annotation { name: "pass"; value: "shadowmap" } ] + filterKeys: [ FilterKey { name: "pass"; value: "shadowmap" } ] shaderProgram: ShaderProgram { vertexShaderCode: loadSource("qrc:/shaders/shadowmap.vert") @@ -61,7 +61,7 @@ Effect { }, RenderPass { - annotations: [ Annotation { name: "pass"; value: "forward" } ] + filterKeys: [ FilterKey { name: "pass"; value: "forward" } ] bindings: [ ParameterMapping { parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterMapping.Uniform }, |