aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-10-01 20:15:46 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-03 08:52:11 +0200
commitd311e1bdfc756e2db9a9b9e4c1269da709e5090a (patch)
tree802ee320f4570b81dc17aecff364c8ccd55b2180 /src/quick
parenta0a037c4651902f43c686dd92b64c98800c0a3a7 (diff)
Respect Qt.vector2d as input to ShaderEffect uniforms.
Change-Id: I7c24f822424d36cf16648d17df161f15083b0da5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickshadereffectnode.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 365a42b5a7..b84d251de5 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -187,6 +187,9 @@ void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMateri
program()->setUniformValue(loc, r.x(), r.y(), r.width(), r.height());
}
break;
+ case QMetaType::QVector2D:
+ program()->setUniformValue(loc, qvariant_cast<QVector2D>(d.value));
+ break;
case QMetaType::QVector3D:
program()->setUniformValue(loc, qvariant_cast<QVector3D>(d.value));
break;