diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 01:00:11 +0100 |
| commit | 9893e71cea5de10193376c1733db627ef0783614 (patch) | |
| tree | 391fabceb9d4ff6ba5f3ff2c2ec42acb613eb4ef /examples/quick/shadereffects | |
| parent | 87e7203532d69e0aaa0898a972d1d90fa589d519 (diff) | |
| parent | e1b4b267aa8c4d9c53e5af4def54f5e9e14e0103 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Icb61522fb41a35303bb3d201b344a0407f67f9a0
Diffstat (limited to 'examples/quick/shadereffects')
| -rw-r--r-- | examples/quick/shadereffects/content/shaders/+qsb/blur.frag | bin | 2247 -> 1811 bytes |
| -rw-r--r-- | examples/quick/shadereffects/content/shaders/+qsb/colorize.frag | bin | 2106 -> 1701 bytes |
| -rw-r--r-- | examples/quick/shadereffects/content/shaders/+qsb/genie.vert | bin | 2629 -> 2201 bytes |
| -rw-r--r-- | examples/quick/shadereffects/content/shaders/+qsb/outline.frag | bin | 2538 -> 2117 bytes |
| -rw-r--r-- | examples/quick/shadereffects/content/shaders/+qsb/shadow.frag | bin | 2151 -> 1745 bytes |
| -rw-r--r-- | examples/quick/shadereffects/content/shaders/+qsb/wobble.frag | bin | 2049 -> 1625 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/shadereffects/content/shaders/+qsb/blur.frag b/examples/quick/shadereffects/content/shaders/+qsb/blur.frag Binary files differindex 1c79359297..d29b2d4365 100644 --- a/examples/quick/shadereffects/content/shaders/+qsb/blur.frag +++ b/examples/quick/shadereffects/content/shaders/+qsb/blur.frag diff --git a/examples/quick/shadereffects/content/shaders/+qsb/colorize.frag b/examples/quick/shadereffects/content/shaders/+qsb/colorize.frag Binary files differindex 45c5301f31..58bb5aaa8e 100644 --- a/examples/quick/shadereffects/content/shaders/+qsb/colorize.frag +++ b/examples/quick/shadereffects/content/shaders/+qsb/colorize.frag diff --git a/examples/quick/shadereffects/content/shaders/+qsb/genie.vert b/examples/quick/shadereffects/content/shaders/+qsb/genie.vert Binary files differindex dd94129cf7..540cb6a85b 100644 --- a/examples/quick/shadereffects/content/shaders/+qsb/genie.vert +++ b/examples/quick/shadereffects/content/shaders/+qsb/genie.vert diff --git a/examples/quick/shadereffects/content/shaders/+qsb/outline.frag b/examples/quick/shadereffects/content/shaders/+qsb/outline.frag Binary files differindex 470e2bd6e6..633fe0f926 100644 --- a/examples/quick/shadereffects/content/shaders/+qsb/outline.frag +++ b/examples/quick/shadereffects/content/shaders/+qsb/outline.frag diff --git a/examples/quick/shadereffects/content/shaders/+qsb/shadow.frag b/examples/quick/shadereffects/content/shaders/+qsb/shadow.frag Binary files differindex 128af21daa..8059fab6ac 100644 --- a/examples/quick/shadereffects/content/shaders/+qsb/shadow.frag +++ b/examples/quick/shadereffects/content/shaders/+qsb/shadow.frag diff --git a/examples/quick/shadereffects/content/shaders/+qsb/wobble.frag b/examples/quick/shadereffects/content/shaders/+qsb/wobble.frag Binary files differindex 9b27ae87cb..85fb453659 100644 --- a/examples/quick/shadereffects/content/shaders/+qsb/wobble.frag +++ b/examples/quick/shadereffects/content/shaders/+qsb/wobble.frag |