From fa9808bad0f8d62b321c58f3026c54ace311b71b Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 21 Oct 2020 17:08:59 +0200 Subject: Fix up shadereffect example docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The screenshot has been out of date for years now. Update it as well. Change-Id: I2b9ae3b0c24b0de7f0cd8a2284d67023237f0944 Reviewed-by: Christian Strømme --- .../doc/images/qml-shadereffects-example.png | Bin 133753 -> 37342 bytes .../quick/shadereffects/doc/src/shadereffects.qdoc | 15 ++++++++------- 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 Binary files a/examples/quick/shadereffects/doc/images/qml-shadereffects-example.png and b/examples/quick/shadereffects/doc/images/qml-shadereffects-example.png 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: -- cgit v1.2.3