diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:57:12 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:57:27 +0100 |
commit | a1dbdcbd6e818118f5fc28cdd39e47a02380adbd (patch) | |
tree | 0d813d9d72baeb1b5f7be048e775896c73f134f5 /tests/manual/rhi/shadowmap | |
parent | 67ea445f09db9feea4e863faa12c45fb007f53a4 (diff) | |
parent | 4cbadf699838406d14366ce61deec03cf45113f7 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
Diffstat (limited to 'tests/manual/rhi/shadowmap')
-rwxr-xr-x | tests/manual/rhi/shadowmap/buildshaders.sh | 5 | ||||
-rw-r--r-- | tests/manual/rhi/shadowmap/main.frag.qsb | bin | 2489 -> 2307 bytes | |||
-rw-r--r-- | tests/manual/rhi/shadowmap/main.vert.qsb | bin | 1595 -> 1587 bytes | |||
-rw-r--r-- | tests/manual/rhi/shadowmap/shadowmap.frag.qsb | bin | 408 -> 466 bytes | |||
-rw-r--r-- | tests/manual/rhi/shadowmap/shadowmap.vert.qsb | bin | 1215 -> 1083 bytes |
5 files changed, 0 insertions, 5 deletions
diff --git a/tests/manual/rhi/shadowmap/buildshaders.sh b/tests/manual/rhi/shadowmap/buildshaders.sh deleted file mode 100755 index 8991bb074a..0000000000 --- a/tests/manual/rhi/shadowmap/buildshaders.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -qsb --glsl "120,300 es" --hlsl 50 --msl 12 shadowmap.vert -o shadowmap.vert.qsb -qsb --glsl "120,300 es" --hlsl 50 --msl 12 shadowmap.frag -o shadowmap.frag.qsb -qsb --glsl "120,300 es" --hlsl 50 --msl 12 main.vert -o main.vert.qsb -qsb --glsl "120,300 es" --hlsl 50 --msl 12 main.frag -o main.frag.qsb diff --git a/tests/manual/rhi/shadowmap/main.frag.qsb b/tests/manual/rhi/shadowmap/main.frag.qsb Binary files differindex 3001908b85..373c62f76d 100644 --- a/tests/manual/rhi/shadowmap/main.frag.qsb +++ b/tests/manual/rhi/shadowmap/main.frag.qsb diff --git a/tests/manual/rhi/shadowmap/main.vert.qsb b/tests/manual/rhi/shadowmap/main.vert.qsb Binary files differindex 8b81a93c00..6392d17cd6 100644 --- a/tests/manual/rhi/shadowmap/main.vert.qsb +++ b/tests/manual/rhi/shadowmap/main.vert.qsb diff --git a/tests/manual/rhi/shadowmap/shadowmap.frag.qsb b/tests/manual/rhi/shadowmap/shadowmap.frag.qsb Binary files differindex 3cad114cf4..fabeb32e65 100644 --- a/tests/manual/rhi/shadowmap/shadowmap.frag.qsb +++ b/tests/manual/rhi/shadowmap/shadowmap.frag.qsb diff --git a/tests/manual/rhi/shadowmap/shadowmap.vert.qsb b/tests/manual/rhi/shadowmap/shadowmap.vert.qsb Binary files differindex 37a5e6ecbf..f224728ff2 100644 --- a/tests/manual/rhi/shadowmap/shadowmap.vert.qsb +++ b/tests/manual/rhi/shadowmap/shadowmap.vert.qsb |