aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris Adams <chris.adams@jollamobile.com>2012-11-19 18:36:09 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-22 07:54:00 +0100
commit7f2cc816e549d704f238af9f5886905d9e2dec86 (patch)
treefd0e0a9a9ca95e3860a1dccd530ad345ada2d9f7 /src
parentfe3aac4a4e4f5ebdcbc13050b30d2d24d5451124 (diff)
Expose QMatrix4x4 properties as mat4 uniforms in shaders
Previously, QMatrix4x4 properties were not exposed as uniforms in shaders. This commit adds conversion code for matrix 4x4 properties so that they are automatically converted to mat4 uniforms. Task-number: QTBUG-27952 Change-Id: I9b1de39fbbcb02743cf8c4e09b4d83c44f1dd438 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src')
-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 b81045518b..7d7955c92a 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -193,6 +193,9 @@ void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMateri
case QMetaType::QVector4D:
program()->setUniformValue(loc, qvariant_cast<QVector4D>(d.value));
break;
+ case QMetaType::QMatrix4x4:
+ program()->setUniformValue(loc, qvariant_cast<QMatrix4x4>(d.value));
+ break;
default:
break;
}