diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2013-09-19 15:00:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 22:38:24 +0200 |
| commit | 6b2118e00c382708c609ebb14a1aa7864e1d98cd (patch) | |
| tree | a840e5b03bd15654762bd9764e2753f36babc15f /src/quick/items/qquickshadereffect.cpp | |
| parent | 60ecb7bfafe85736ab3294a3ba03255f6fdac257 (diff) | |
Fix uniform property mapping docs in ShaderEffect
QVector4D and QMatrix4x4 are supported too, while QTransform maps to
mat3 instead of mat4.
Change-Id: Ibba7174dc21f475276e2ee8ecb585740d7bdfa4a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/items/qquickshadereffect.cpp')
| -rw-r--r-- | src/quick/items/qquickshadereffect.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index f39a15070c..3a36f1ad6b 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -573,7 +573,9 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, the shader. \li QPoint, QPointF, QSize, QSizeF -> vec2 \li QVector3D -> vec3 - \li QTransform -> mat4 + \li QVector4D -> vec4 + \li QTransform -> mat3 + \li QMatrix4x4 -> mat4 \li \l Image, \l ShaderEffectSource -> sampler2D - Origin is in the top-left corner, and the color values are premultiplied. \endlist |