diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 16:43:00 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 16:43:02 +0100 |
commit | af368200c2ea17c64abae30ebcb3b08399b32861 (patch) | |
tree | 32b7e78cf7d18b7ed2396a3c9b82055f97dd389a | |
parent | 023b3c86021d8463d216f76e8fd281d6eb4dcc3e (diff) | |
parent | 0bade306539069c353d4c3b5f232d1885298224c (diff) | |
download | qtgraphicaleffects-af368200c2ea17c64abae30ebcb3b08399b32861.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id90bd6d65f15785215cdac2c19bae937925afbd3
-rw-r--r-- | src/effects/private/GaussianDirectionalBlur.qml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/effects/private/GaussianDirectionalBlur.qml b/src/effects/private/GaussianDirectionalBlur.qml index c2af1f3..20a4658 100644 --- a/src/effects/private/GaussianDirectionalBlur.qml +++ b/src/effects/private/GaussianDirectionalBlur.qml @@ -102,7 +102,7 @@ Item { property variant factor_21_23: Qt.vector3d(gwts[21], gwts[22], gwts[23]); property variant factor_24_26: Qt.vector3d(gwts[24], gwts[25], gwts[26]); property variant factor_27_29: Qt.vector3d(gwts[27], gwts[28], gwts[29]); - property variant factor_30_32: Qt.vector3d(gwts[30], gwts[31], gwts[32]); + property variant factor_30_31: Qt.point(gwts[30], gwts[31]); property color color: rootItem.color property real spread: 1.0 - (rootItem.spread * 0.98) @@ -176,9 +176,8 @@ Item { "gl_FragColor += texture2D(source, texCoord) * factor_27_29.y; texCoord += shift;", "gl_FragColor += texture2D(source, texCoord) * factor_27_29.z; texCoord += shift;", - "gl_FragColor += texture2D(source, texCoord) * factor_30_32.x; texCoord += shift;", - "gl_FragColor += texture2D(source, texCoord) * factor_30_32.y; texCoord += shift;", - "gl_FragColor += texture2D(source, texCoord) * factor_30_32.z; texCoord += shift;" + "gl_FragColor += texture2D(source, texCoord) * factor_30_31.x; texCoord += shift;", + "gl_FragColor += texture2D(source, texCoord) * factor_30_31.y; texCoord += shift;" ] var shader = fragmentShaderBegin @@ -253,7 +252,7 @@ Item { uniform highp vec3 factor_21_23; uniform highp vec3 factor_24_26; uniform highp vec3 factor_27_29; - uniform highp vec3 factor_30_32; + uniform highp vec3 factor_30_31; uniform highp float gaussianSum; uniform highp float expandX; uniform highp float expandY; |