diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:41:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:52:58 +0100 |
| commit | b684ba219493fb7b0108ae367d6d033aaa28053b (patch) | |
| tree | f1fec8922da198e231416b50ef8f441ef6db065b /tests/manual/scenegraph_lancelot | |
| parent | 97a5cf86345fd72cdff83c03664c19a8f5cdf79a (diff) | |
| parent | 8354851b628ebae567a9125cbd0ba69268470c1b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
Diffstat (limited to 'tests/manual/scenegraph_lancelot')
12 files changed, 0 insertions, 0 deletions
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 |