summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-10-21 17:08:59 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-10-23 07:51:59 +0000
commitfa9808bad0f8d62b321c58f3026c54ace311b71b (patch)
tree96f8a7a39b736ae79860e516961504d5f41b8228 /examples
parent18ea028a81b64f7ccc78d7d58f39ce18424de564 (diff)
Fix up shadereffect example docs
The screenshot has been out of date for years now. Update it as well. Change-Id: I2b9ae3b0c24b0de7f0cd8a2284d67023237f0944 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/shadereffects/doc/images/qml-shadereffects-example.pngbin133753 -> 37342 bytes
-rw-r--r--examples/quick/shadereffects/doc/src/shadereffects.qdoc15
2 files changed, 8 insertions, 7 deletions
diff --git a/examples/quick/shadereffects/doc/images/qml-shadereffects-example.png b/examples/quick/shadereffects/doc/images/qml-shadereffects-example.png
index aba4e1faa9..c97a884687 100644
--- a/examples/quick/shadereffects/doc/images/qml-shadereffects-example.png
+++ b/examples/quick/shadereffects/doc/images/qml-shadereffects-example.png
Binary files differ
diff --git a/examples/quick/shadereffects/doc/src/shadereffects.qdoc b/examples/quick/shadereffects/doc/src/shadereffects.qdoc
index d217c956ad..ebb9ca7c15 100644
--- a/examples/quick/shadereffects/doc/src/shadereffects.qdoc
+++ b/examples/quick/shadereffects/doc/src/shadereffects.qdoc
@@ -51,13 +51,14 @@
shader:
\snippet shadereffects/shadereffects.qml fragment
- In order to support multiple graphics APIs, not just OpenGL, the shader
- source is not embedded into QML. When running with the graphics API
- independent scene graph, the actual file in use is a pre-generated shader
- pack containing multiple variants of the shader code. The appropriate
- shader is then chosen by Qt Quick, regardless of running on Vulkan, Metal,
- Direct 3D, or OpenGL. Qt automatically selects the file under the \c qsb
- selector, for example \c{shaders/+qsb/wobble.frag}, when present.
+ In order to support multiple graphics APIs, not just OpenGL, the
+ shader source is not embedded into QML. The referenced \c{.qsb}
+ file is a pre-generated shader pack containing multiple variants
+ of the shader code. The appropriate shader is then chosen by Qt
+ Quick at run time, depending on the graphics API (Vulkan, Metal,
+ Direct3D 11, or OpenGL) used at run time. The .qsb file is
+ generated offline and is bundled with the executable via the Qt
+ Resource System.
You can use any custom property on the ShaderEffect in your shader. This
makes animated shader code very easy: