From 7f2cc816e549d704f238af9f5886905d9e2dec86 Mon Sep 17 00:00:00 2001
From: Chris Adams <chris.adams@jollamobile.com>
Date: Mon, 19 Nov 2012 18:36:09 +1000
Subject: Expose QMatrix4x4 properties as mat4 uniforms in shaders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/quick/items/qquickshadereffectnode.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/quick/items/qquickshadereffectnode.cpp')

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;
                 }
-- 
cgit v1.2.3