QBlendState cleanup

* renamed to QBlendEquationArguments
* property names expanded

Change-Id: Id25f0181415b4f093f2054238dbf3be26e36ff32
Task-number: QTBUG-51509
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

6 files changed, 26 insertions, 24 deletions

diff --git a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
index 15edddb6c..4e1396ee6 100644
--- a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
+++ b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
@@ -97,9 +97,9 @@ Material {
                     shaderProgram: gl3PhongAlphaShader
                     renderStates: [
                         DepthMask { mask: false },
-                        BlendState {
-                            srcRGB: BlendState.SrcAlpha
-                            dstRGB: BlendState.OneMinusSrcAlpha
+                        BlendEquationArguments {
+                            sourceRgb: BlendEquationArguments.SourceAlpha
+                            destinationRgb: BlendEquationArguments.OneMinusSourceAlpha
                         },
                         BlendEquation {blendFunction: BlendEquation.FuncAdd}
                     ]
@@ -119,9 +119,9 @@ Material {
                     shaderProgram: gl2es2PhongAlphaShader
                     renderStates: [
                         DepthMask { mask: false },
-                        BlendState {
-                            srcRGB: BlendState.SrcAlpha
-                            dstRGB: BlendState.OneMinusSrcAlpha
+                        BlendEquationArguments {
+                            sourceRgb: BlendEquationArguments.SourceAlpha
+                            destinationRgb: BlendEquationArguments.OneMinusSourceAlpha
                         },
                         BlendEquation {blendFunction: BlendEquation.Add}
                     ]
diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
index ad9acac96..2ba9ddcb4 100644
--- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
+++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
@@ -178,8 +178,10 @@ Material {
                     RenderPass {
                         annotations : [Annotation {name : "Name"; value : "Texture" }]
                         bindings: ParameterMapping {parameterName: "texture"; shaderVariableName: "tex"; bindingType: ParameterMapping.Uniform}
-                        renderStates : [BlendState {srcRGB: BlendState.One; dstRGB : BlendState.One},
-                            BlendEquation {blendFunction: BlendEquation.Add},
+
+                        renderStates : [BlendEquationArguments {sourceRgb: BlendEquationArguments.One; destinationRgb : BlendEquationArguments.One},
+                                        BlendEquation {blendFunction: BlendEquation.Add},
+
                             CullFace { mode : CullFace.Back },
                             DepthTest { depthFunction : DepthTest.LessOrEqual}
                         ]
diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml
index 2de37f8dc..87e6238dd 100644
--- a/examples/qt3d/playground-qml/ComplexTechnique.qml
+++ b/examples/qt3d/playground-qml/ComplexTechnique.qml
@@ -153,7 +153,7 @@ Technique {
         },
         RenderPass {
             annotations : [Annotation {name : "Name"; value : "Lighting" }]
-            renderStates : [BlendState {srcRGB: BlendState.One; dstRGB : BlendState.One},
+            renderStates : [BlendEquationArguments {sourceRgb: BlendEquationArguments.One; destinationRgb : BlendEquationArguments.One},
                 BlendEquation {blendFunction: BlendEquation.Add},
                 CullFace { mode : CullFace.Back },
                 DepthTest { depthFunction : DepthTest.LessOrEqual}
diff --git a/examples/qt3d/transparency-qml-scene3d/Scene.qml b/examples/qt3d/transparency-qml-scene3d/Scene.qml
index a43f505ef..6a9eb36b7 100644
--- a/examples/qt3d/transparency-qml-scene3d/Scene.qml
+++ b/examples/qt3d/transparency-qml-scene3d/Scene.qml
@@ -156,9 +156,9 @@ Entity {
                             CullFace { mode : CullFace.Back },
                             DepthTest { depthFunction: DepthTest.Less },
                             DepthMask { mask: false },
-                            BlendState {
-                                srcRGB: BlendState.SrcAlpha
-                                dstRGB: BlendState.OneMinusSrcAlpha
+                            BlendEquationArguments {
+                                sourceRgb: BlendEquationArguments.SourceAlpha
+                                destinationRgb: BlendEquationArguments.OneMinusSourceAlpha
                             }
                             ,BlendEquation {blendFunction: BlendEquation.Add}
                         ]
@@ -180,9 +180,9 @@ Entity {
                             CullFace { mode : CullFace.Back },
                             DepthTest { depthFunction: DepthTest.Less },
                             DepthMask { mask: false },
-                            BlendState {
-                                srcRGB: BlendState.SrcAlpha
-                                dstRGB: BlendState.OneMinusSrcAlpha
+                            BlendEquationArguments {
+                                sourceRgb: BlendEquationArguments.SourceAlpha
+                                destinationRgb: BlendEquationArguments.OneMinusSourceAlpha
                             }
                             ,BlendEquation {blendFunction: BlendEquation.Add}
                         ]
diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml
index eb2044b7d..6a37ab1b8 100644
--- a/examples/qt3d/transparency-qml/main.qml
+++ b/examples/qt3d/transparency-qml/main.qml
@@ -174,9 +174,9 @@ Entity {
                             CullFace { mode : CullFace.Back },
                             DepthTest { depthFunction: DepthTest.Less },
                             DepthMask { mask: false },
-                            BlendState {
-                                srcRGB: BlendState.SrcAlpha
-                                dstRGB: BlendState.OneMinusSrcAlpha
+                            BlendEquationArguments {
+                                sourceRgb: BlendEquationArguments.SourceAlpha
+                                destinationRgb: BlendEquationArguments.OneMinusSourceAlpha
                             }
                             ,BlendEquation {blendFunction: BlendEquation.Add}
                         ]
@@ -199,9 +199,9 @@ Entity {
                             CullFace { mode : CullFace.Back },
                             DepthTest { depthFunction: DepthTest.Less },
                             DepthMask { mask: false },
-                            BlendState {
-                                srcRGB: BlendState.SrcAlpha
-                                dstRGB: BlendState.OneMinusSrcAlpha
+                            BlendEquationArguments {
+                                sourceRgb: BlendEquationArguments.SourceAlpha
+                                destinationRgb: BlendEquationArguments.OneMinusSourceAlpha
                             }
                             ,BlendEquation {blendFunction: BlendEquation.Add}
                         ]
diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index 9d358d08b..463bc0cd2 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -95,9 +95,9 @@ Effect {
                     renderStates: [
                         DepthTest { depthFunction: DepthTest.Always },
                         DepthMask { mask: true },
-                        BlendState {
-                            srcRGB: BlendState.One
-                            dstRGB: BlendState.OneMinusSrcColor
+                        BlendEquationArguments {
+                            sourceRgb: BlendEquationArguments.One
+                            destinationRgb: BlendEquationArguments.OneMinusSrcColor
                         }
                     ]