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 /tests/manual | |
parent | 87e7203532d69e0aaa0898a972d1d90fa589d519 (diff) | |
parent | e1b4b267aa8c4d9c53e5af4def54f5e9e14e0103 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Icb61522fb41a35303bb3d201b344a0407f67f9a0
Diffstat (limited to 'tests/manual')
17 files changed, 0 insertions, 0 deletions
diff --git a/tests/manual/nodetypes_ng/buildshaders.bat b/tests/manual/nodetypes_ng/compile.bat index 328b216c07..328b216c07 100755 --- a/tests/manual/nodetypes_ng/buildshaders.bat +++ b/tests/manual/nodetypes_ng/compile.bat diff --git a/tests/manual/nodetypes_ng/shadow_pass1.frag.qsb b/tests/manual/nodetypes_ng/shadow_pass1.frag.qsb Binary files differindex f90265a997..4c913fee08 100644 --- a/tests/manual/nodetypes_ng/shadow_pass1.frag.qsb +++ b/tests/manual/nodetypes_ng/shadow_pass1.frag.qsb diff --git a/tests/manual/nodetypes_ng/shadow_pass2.frag.qsb b/tests/manual/nodetypes_ng/shadow_pass2.frag.qsb Binary files differindex 9608763b61..4f6e6634e7 100644 --- a/tests/manual/nodetypes_ng/shadow_pass2.frag.qsb +++ b/tests/manual/nodetypes_ng/shadow_pass2.frag.qsb diff --git a/tests/manual/nodetypes_ng/wobble.frag.qsb b/tests/manual/nodetypes_ng/wobble.frag.qsb Binary files differindex 7d3105fd3c..f1766f4363 100644 --- a/tests/manual/nodetypes_ng/wobble.frag.qsb +++ b/tests/manual/nodetypes_ng/wobble.frag.qsb diff --git a/tests/manual/nodetypes_ng/wobble.vert.qsb b/tests/manual/nodetypes_ng/wobble.vert.qsb Binary files differindex 92b8ba9703..2715c84616 100644 --- a/tests/manual/nodetypes_ng/wobble.vert.qsb +++ b/tests/manual/nodetypes_ng/wobble.vert.qsb diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag Binary files differindex c6da52fd32..15459ffdb9 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag Binary files differindex e9c48edbb9..5ef0333b6b 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag Binary files differindex 6f44fff112..edf2d11a93 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag Binary files differindex 01a1d1cb3d..aecaa621ef 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag Binary files differindex 78ac8a9c95..ef7a9c10ca 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag Binary files differindex 364fffab52..ca58580786 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag Binary files differindex 42bebf490a..e1fc8b0ce8 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag Binary files differindex ed31582cf9..2e0b809d7d 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag Binary files differindex 7fe041f0ae..106c2c5515 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag Binary files differindex cb3428b75f..788a047ab0 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag Binary files differindex ccf3633d64..e3907a90d2 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert Binary files differindex 04850feb27..14cb4e768f 100644 --- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert +++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert |