diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-08-17 12:28:16 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-08-17 18:20:36 +0200 |
| commit | 81159cf3f7c47dbab4c781f3b4ffa9e0a202b1dc (patch) | |
| tree | 3010feb8eee9499f8871372c534acdf51bf8c4a8 /tests/manual | |
| parent | 80862621cdad3cb962e134937b09f5ef3bd3d64c (diff) | |
rhi: Enable msaatexture manual test on OpenGL
...now that a recent path enables MultisampleTextures for ES >= 3.1 and
GL 3.x and up.
Just need to make sure the .qsb contains something for OpenGL as well.
While we are at it, make updated .qsb files for all the commonly used
shaders since what we had before was version 4. Bump them to version 5.
Change-Id: If2040f4894e6360d1ebd5daf7e698508e5e6e42e
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/rhi/shared/buildshaders.bat | 2 | ||||
| -rw-r--r-- | tests/manual/rhi/shared/color.frag.qsb | bin | 1179 -> 1135 bytes | |||
| -rw-r--r-- | tests/manual/rhi/shared/color.vert.qsb | bin | 1318 -> 1235 bytes | |||
| -rw-r--r-- | tests/manual/rhi/shared/texture.frag.qsb | bin | 1345 -> 1289 bytes | |||
| -rw-r--r-- | tests/manual/rhi/shared/texture.vert.qsb | bin | 1574 -> 1475 bytes | |||
| -rw-r--r-- | tests/manual/rhi/shared/texture_ms4.frag.qsb | bin | 1555 -> 1725 bytes |
6 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/rhi/shared/buildshaders.bat b/tests/manual/rhi/shared/buildshaders.bat index dde5f7b3d2..7974683bd7 100644 --- a/tests/manual/rhi/shared/buildshaders.bat +++ b/tests/manual/rhi/shared/buildshaders.bat @@ -2,4 +2,4 @@ qsb --glsl "100 es,120" --hlsl 50 --msl 12 -c color.vert -o color.vert.qsb qsb --glsl "100 es,120" --hlsl 50 --msl 12 -c color.frag -o color.frag.qsb qsb --glsl "100 es,120" --hlsl 50 --msl 12 -c texture.vert -o texture.vert.qsb qsb --glsl "100 es,120" --hlsl 50 --msl 12 -c texture.frag -o texture.frag.qsb -qsb --hlsl 50 --msl 12 -c texture_ms4.frag -o texture_ms4.frag.qsb +qsb --glsl "310 es,150" --hlsl 50 --msl 12 -c texture_ms4.frag -o texture_ms4.frag.qsb diff --git a/tests/manual/rhi/shared/color.frag.qsb b/tests/manual/rhi/shared/color.frag.qsb Binary files differindex 51501ad5e6..0c3815b8be 100644 --- a/tests/manual/rhi/shared/color.frag.qsb +++ b/tests/manual/rhi/shared/color.frag.qsb diff --git a/tests/manual/rhi/shared/color.vert.qsb b/tests/manual/rhi/shared/color.vert.qsb Binary files differindex e342718fec..dfa577f668 100644 --- a/tests/manual/rhi/shared/color.vert.qsb +++ b/tests/manual/rhi/shared/color.vert.qsb diff --git a/tests/manual/rhi/shared/texture.frag.qsb b/tests/manual/rhi/shared/texture.frag.qsb Binary files differindex ad11300a59..b535db90a5 100644 --- a/tests/manual/rhi/shared/texture.frag.qsb +++ b/tests/manual/rhi/shared/texture.frag.qsb diff --git a/tests/manual/rhi/shared/texture.vert.qsb b/tests/manual/rhi/shared/texture.vert.qsb Binary files differindex 288cce8176..f09ed73ef8 100644 --- a/tests/manual/rhi/shared/texture.vert.qsb +++ b/tests/manual/rhi/shared/texture.vert.qsb diff --git a/tests/manual/rhi/shared/texture_ms4.frag.qsb b/tests/manual/rhi/shared/texture_ms4.frag.qsb Binary files differindex 278313111b..4080308652 100644 --- a/tests/manual/rhi/shared/texture_ms4.frag.qsb +++ b/tests/manual/rhi/shared/texture_ms4.frag.qsb |