diff options
| author | Gunnar Sletta <gunnar@sletta.org> | 2015-09-09 11:22:37 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@sletta.org> | 2015-09-11 07:10:28 +0000 |
| commit | 8feca74deda0abca0bc1787e18d227c2a3d578e7 (patch) | |
| tree | 662e49a5a32158acb1ff5516f9aac96a927bef6a | |
| parent | af0a53d89835baa86698b40ac845024ee49e71b1 (diff) | |
Include doc note about Image::fillMode being excluded by shader.
Change-Id: I8731ea81421e8f6cea7d59bea82030d0855b0054
Task-number: QTBUG-48113
Reviewed-by: Michael Brasser <michael.brasser@live.com>
| -rw-r--r-- | src/quick/items/qquickshadereffect.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index 0be305b693..349207f145 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -578,8 +578,12 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, \li QTransform -> mat3 \li QMatrix4x4 -> mat4 \li QQuaternion -> vec4, scalar value is \c w. - \li \l Image, \l ShaderEffectSource -> sampler2D - Origin is in the top-left - corner, and the color values are premultiplied. + \li \l Image -> sampler2D - Origin is in the top-left corner, and the + color values are premultiplied. The texture is provided as is, + excluding the Image item's fillMode. To include fillMode, use a + ShaderEffectSource or Image::layer::enabled. + \li \l ShaderEffectSource -> sampler2D - Origin is in the top-left + corner, and the color values are premultiplied. \endlist The QML scene graph back-end may choose to allocate textures in texture |