From 81159cf3f7c47dbab4c781f3b4ffa9e0a202b1dc Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 17 Aug 2020 12:28:16 +0200 Subject: 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 --- tests/manual/rhi/shared/buildshaders.bat | 2 +- tests/manual/rhi/shared/color.frag.qsb | Bin 1179 -> 1135 bytes tests/manual/rhi/shared/color.vert.qsb | Bin 1318 -> 1235 bytes tests/manual/rhi/shared/texture.frag.qsb | Bin 1345 -> 1289 bytes tests/manual/rhi/shared/texture.vert.qsb | Bin 1574 -> 1475 bytes tests/manual/rhi/shared/texture_ms4.frag.qsb | Bin 1555 -> 1725 bytes 6 files changed, 1 insertion(+), 1 deletion(-) 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 index 51501ad5e6..0c3815b8be 100644 Binary files a/tests/manual/rhi/shared/color.frag.qsb and b/tests/manual/rhi/shared/color.frag.qsb differ diff --git a/tests/manual/rhi/shared/color.vert.qsb b/tests/manual/rhi/shared/color.vert.qsb index e342718fec..dfa577f668 100644 Binary files a/tests/manual/rhi/shared/color.vert.qsb and b/tests/manual/rhi/shared/color.vert.qsb differ diff --git a/tests/manual/rhi/shared/texture.frag.qsb b/tests/manual/rhi/shared/texture.frag.qsb index ad11300a59..b535db90a5 100644 Binary files a/tests/manual/rhi/shared/texture.frag.qsb and b/tests/manual/rhi/shared/texture.frag.qsb differ diff --git a/tests/manual/rhi/shared/texture.vert.qsb b/tests/manual/rhi/shared/texture.vert.qsb index 288cce8176..f09ed73ef8 100644 Binary files a/tests/manual/rhi/shared/texture.vert.qsb and b/tests/manual/rhi/shared/texture.vert.qsb differ diff --git a/tests/manual/rhi/shared/texture_ms4.frag.qsb b/tests/manual/rhi/shared/texture_ms4.frag.qsb index 278313111b..4080308652 100644 Binary files a/tests/manual/rhi/shared/texture_ms4.frag.qsb and b/tests/manual/rhi/shared/texture_ms4.frag.qsb differ -- cgit v1.2.3