QRenderPass: renamed criteria property to annotations

Change-Id: Id824323880a3cf310adb1c581c440eeff9451d4f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

10 files changed, 21 insertions, 21 deletions

diff --git a/examples/deferred-renderer-cpp/finaleffect.cpp b/examples/deferred-renderer-cpp/finaleffect.cpp
index f9f6010b9..d7298edd7 100644
--- a/examples/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/deferred-renderer-cpp/finaleffect.cpp
@@ -69,7 +69,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     gl3Shader->setVertexShaderSourceFile(QStringLiteral(":/final_gl3.vert"));
     gl3Shader->setFragmentShaderSourceFile(QStringLiteral(":/final_gl3.frag"));
 
-    m_gl3Pass->addCriterion(m_passCriterion);
+    m_gl3Pass->addAnnotation(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addPass(m_gl3Pass);
 
@@ -77,7 +77,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     gl2Shader->setVertexShaderSourceFile(QStringLiteral(":/final_gl2.vert"));
     gl2Shader->setFragmentShaderSourceFile(QStringLiteral(":/final_gl2.frag"));
 
-    m_gl2Pass->addCriterion(m_passCriterion);
+    m_gl2Pass->addAnnotation(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
     m_gl2Technique->addPass(m_gl2Pass);
 
diff --git a/examples/deferred-renderer-cpp/sceneeffect.cpp b/examples/deferred-renderer-cpp/sceneeffect.cpp
index f67c070e7..0e2a62c4e 100644
--- a/examples/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/deferred-renderer-cpp/sceneeffect.cpp
@@ -71,7 +71,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent)
     gl3Shader->setVertexShaderSourceFile(QStringLiteral(":/geometry_gl3.vert"));
     gl3Shader->setFragmentShaderSourceFile(QStringLiteral(":/geometry_gl3.frag"));
 
-    m_gl3Pass->addCriterion(m_passCriterion);
+    m_gl3Pass->addAnnotation(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addPass(m_gl3Pass);
 
@@ -79,7 +79,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent)
     gl2Shader->setVertexShaderSourceFile(QStringLiteral(":/geometry_gl2.vert"));
     gl2Shader->setFragmentShaderSourceFile(QStringLiteral(":/geometry_gl2.frag"));
 
-    m_gl2Pass->addCriterion(m_passCriterion);
+    m_gl2Pass->addAnnotation(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
     m_gl2Technique->addPass(m_gl2Pass);
 
diff --git a/examples/deferred-renderer-qml/FinalEffect.qml b/examples/deferred-renderer-qml/FinalEffect.qml
index b2d45e0d7..90c9edc32 100644
--- a/examples/deferred-renderer-qml/FinalEffect.qml
+++ b/examples/deferred-renderer-qml/FinalEffect.qml
@@ -48,7 +48,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
             renderPasses : RenderPass {
-                criteria : Annotation { name : "pass"; value : "final" }
+                annotations : Annotation { name : "pass"; value : "final" }
                 shaderProgram : ShaderProgram {
                     id : finalShaderGL3
                     vertexShaderCode:
@@ -106,7 +106,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.None; minorVersion : 0; majorVersion : 2 }
             renderPasses : RenderPass {
-                criteria : Annotation { name : "pass"; value : "final" }
+                annotations : Annotation { name : "pass"; value : "final" }
                 shaderProgram : ShaderProgram {
                     id : finalShaderGL2
                     vertexShaderCode:
diff --git a/examples/deferred-renderer-qml/SceneEffect.qml b/examples/deferred-renderer-qml/SceneEffect.qml
index 88cfa4873..0540c8ba1 100644
--- a/examples/deferred-renderer-qml/SceneEffect.qml
+++ b/examples/deferred-renderer-qml/SceneEffect.qml
@@ -49,7 +49,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
             renderPasses : RenderPass {
-                criteria : Annotation { name : "pass"; value : "geometry" }
+                annotations : Annotation { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
                     id : sceneShaderGL3
                     vertexShaderCode:
@@ -100,7 +100,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 0; majorVersion : 2 }
             renderPasses : RenderPass {
-                criteria : Annotation { name : "pass"; value : "geometry" }
+                annotations : Annotation { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
                     id : sceneShaderGL2
                     vertexShaderCode:
diff --git a/examples/playground-qml/SimpleEffect.qml b/examples/playground-qml/SimpleEffect.qml
index 677ab4a9c..00e9981a2 100644
--- a/examples/playground-qml/SimpleEffect.qml
+++ b/examples/playground-qml/SimpleEffect.qml
@@ -49,7 +49,7 @@ Effect {
         Technique {
             id: technique1
 
-            criteria : [
+            annotations : [
                 TechniqueCriterion { criterionType : TechniqueCriterion.CustomType; criterionCustomType: "useEarlyZ"; criterionValue : true},
                 TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "forward"}
             ]
@@ -71,7 +71,7 @@ Effect {
         Technique {
             id: technique2
 
-            criteria : [
+            annotations : [
                 TechniqueCriterion { criterionType : TechniqueCriterion.CustomType; criterionCustomType: "useEarlyZ"; criterionValue : false},
                 TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "forward"}
             ]
@@ -86,7 +86,7 @@ Effect {
         Technique {
             id: technique3
 
-            criteria : [
+            annotations : [
                 TechniqueCriterion { criterionType : TechniqueCriterion.CustomType; criterionCustomType: "useEarlyZ"; criterionValue : false},
                 TechniqueCriterion { criterionType : TechniqueCriterion.RenderingStyle; criterionValue : "deferred"}
             ]
diff --git a/examples/playground-qml/main.qml b/examples/playground-qml/main.qml
index 0bba43182..57c98099b 100644
--- a/examples/playground-qml/main.qml
+++ b/examples/playground-qml/main.qml
@@ -263,7 +263,7 @@ Entity {
                         openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
                         renderPasses : [
                             RenderPass {
-                                criteria : [Annotation {name : "Name"; value : "TextureLighting" }]
+                                annotations : [Annotation {name : "Name"; value : "TextureLighting" }]
                                 bindings : [ // Add only the bindings needed for a shader
                                     ParameterMapper {parameterName: "vertexTexCoord"; shaderVariableName: "texCoord0"; bindingType: ParameterMapper.Attribute},
                                     ParameterMapper {parameterName: "tex"; shaderVariableName: "texture"; bindingType: ParameterMapper.Uniform},
@@ -326,7 +326,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : [Annotation {name : "Name"; value : "Texture" }]
+                                annotations : [Annotation {name : "Name"; value : "Texture" }]
                                 shaderProgram : ShaderProgram {
                                     vertexShaderCode : "
                                     #version 140
@@ -356,7 +356,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : [Annotation {name : "Name"; value : "Lighting" }]
+                                annotations : [Annotation {name : "Name"; value : "Lighting" }]
                                 renderStates : [BlendState {srcRGB: BlendState.One; dstRGB : BlendState.One},
                                               BlendEquation {mode: BlendEquation.FuncAdd},
                                               CullFace { mode : CullFace.Back },
@@ -413,7 +413,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : Annotation {name : "Name"; value : "Final" }
+                                annotations : Annotation {name : "Name"; value : "Final" }
                                 shaderProgram : ShaderProgram {
                                     vertexShaderCode: "
                                     #version 140
@@ -493,7 +493,7 @@ Entity {
 
                         renderPasses : [
                             RenderPass {
-                                criteria : []
+                                annotations : []
                                 bindings : [ // Add only the bindings needed for a shader
                                     ParameterMapper {parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterMapper.Uniform},
                                     ParameterMapper {parameterName: "diffuse"; shaderVariableName: "kd"; bindingType: ParameterMapper.Uniform},
diff --git a/examples/rollerball/AdsEffect.qml b/examples/rollerball/AdsEffect.qml
index d4c10d132..253fcfa49 100644
--- a/examples/rollerball/AdsEffect.qml
+++ b/examples/rollerball/AdsEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 1
             }
 
-            criteria: [ Annotation { name : "renderingStyle"; value : "forward" } ]
+            annotations : [ Annotation { name : "renderingStyle"; value : "forward" } ]
 
             parameters: [
                 Parameter { name: "lightPosition";  value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },
diff --git a/examples/shadow-map-qml/AdsEffect.qml b/examples/shadow-map-qml/AdsEffect.qml
index 7bf1b577d..7b690e690 100644
--- a/examples/shadow-map-qml/AdsEffect.qml
+++ b/examples/shadow-map-qml/AdsEffect.qml
@@ -82,7 +82,7 @@ Effect {
 
             renderPasses: [
                 RenderPass {
-                    criteria: [ Annotation { name: "pass"; value: "shadowmap" } ]
+                    annotations: [ Annotation { name: "pass"; value: "shadowmap" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderSourceFile:   ":/shaders/shadowmap.vert"
@@ -96,7 +96,7 @@ Effect {
                 },
 
                 RenderPass {
-                    criteria: [ Annotation { name : "pass"; value : "forward" } ]
+                    annotations: [ Annotation { name : "pass"; value : "forward" } ]
 
                     // The bindings property allows us to map from names of parameters (uniforms or vertex attributes)
                     // within a shader to more friendly names in QML. By default the parameter names are exposed from
diff --git a/examples/tessellation-modes/TessellatedWireframeEffect.qml b/examples/tessellation-modes/TessellatedWireframeEffect.qml
index eb33bbb44..7feaa66e9 100644
--- a/examples/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/tessellation-modes/TessellatedWireframeEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 0
             }
 
-            criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+            annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d(0.0, 0.0, 0.0, 1.0) },
diff --git a/examples/wireframe/WireframeEffect.qml b/examples/wireframe/WireframeEffect.qml
index 4ad5b63fb..34e385ba3 100644
--- a/examples/wireframe/WireframeEffect.qml
+++ b/examples/wireframe/WireframeEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 1
             }
 
-            criteria: [ Annotation { name : "renderingStyle"; value : "forward" } ]
+            annotations: [ Annotation { name : "renderingStyle"; value : "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d(0.0, 0.0, 0.0, 1.0) },