tests/shader_runner: Get rid of some redundant "| glsl" conditions.

We don't run shader model 6 GLSL tests.
This commit is contained in:
Henri Verbeet 2024-05-02 17:11:57 +02:00 committed by Alexandre Julliard
parent 592e902d47
commit 62a512c4f8
Notes: Alexandre Julliard 2024-05-02 22:41:04 +02:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/845
5 changed files with 14 additions and 14 deletions

View File

@ -33,7 +33,7 @@ float4 main(float4 pos : sv_position) : sv_target
} }
[test] [test]
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (2.0, 1.0, 0.0, 14.0) probe all rgba (2.0, 1.0, 0.0, 14.0)
@ -50,7 +50,7 @@ float4 main(float4 pos : sv_position) : sv_target
} }
[test] [test]
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (2.0, 2.0, 0.0, 0.0) probe all rgba (2.0, 2.0, 0.0, 0.0)
@ -67,7 +67,7 @@ float4 main(float4 pos : sv_position) : sv_target
} }
[test] [test]
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (2.0, 1.0, 0.0, 14.0) probe all rgba (2.0, 1.0, 0.0, 14.0)
@ -84,5 +84,5 @@ float4 main(float4 pos : sv_position) : sv_target
} }
[test] [test]
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (45.0, 50.0, -14.0, -47.0) probe all rgba (45.0, 50.0, -14.0, -47.0)

View File

@ -65,14 +65,14 @@ uniform 0 float4 0.75 0.75 0.0 0.0
clear rtv 0 1.0 1.0 1.0 1.0 clear rtv 0 1.0 1.0 1.0 1.0
clear dsv 0.5 clear dsv 0.5
depth greater equal depth greater equal
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (0.0, 1.0, 0.0, 1.0) probe all rgba (0.0, 1.0, 0.0, 1.0)
probe dsv all r (0.75) probe dsv all r (0.75)
uniform 0 float4 0.75 0.375 0.0 0.0 uniform 0 float4 0.75 0.375 0.0 0.0
clear rtv 0 1.0 1.0 1.0 1.0 clear rtv 0 1.0 1.0 1.0 1.0
clear dsv 0.5 clear dsv 0.5
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0) probe all rgba (1.0, 1.0, 1.0, 1.0)
probe dsv all r (0.5) probe dsv all r (0.5)
@ -91,20 +91,20 @@ uniform 0 float4 0.75 0.75 0.0 0.0
clear rtv 0 1.0 1.0 1.0 1.0 clear rtv 0 1.0 1.0 1.0 1.0
clear dsv 0.5 clear dsv 0.5
depth greater equal depth greater equal
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (0.0, 1.0, 0.0, 1.0) probe all rgba (0.0, 1.0, 0.0, 1.0)
probe dsv all r (0.75) probe dsv all r (0.75)
uniform 0 float4 0.375 0.625 0.0 0.0 uniform 0 float4 0.375 0.625 0.0 0.0
clear rtv 0 1.0 1.0 1.0 1.0 clear rtv 0 1.0 1.0 1.0 1.0
clear dsv 0.5 clear dsv 0.5
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (0.0, 1.0, 0.0, 1.0) probe all rgba (0.0, 1.0, 0.0, 1.0)
probe dsv all r (0.625) probe dsv all r (0.625)
uniform 0 float4 0.375 0.375 0.0 0.0 uniform 0 float4 0.375 0.375 0.0 0.0
clear rtv 0 1.0 1.0 1.0 1.0 clear rtv 0 1.0 1.0 1.0 1.0
clear dsv 0.5 clear dsv 0.5
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0) probe all rgba (1.0, 1.0, 1.0, 1.0)
probe dsv all r (0.5) probe dsv all r (0.5)

View File

@ -15,5 +15,5 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (-0.125, -0.375, 0.375, -0.125) probe all rgba (-0.125, -0.375, 0.375, -0.125)

View File

@ -228,6 +228,6 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
if(sm<6) probe all rgba (2.0, 1.0, 1.0, 1.0) if(sm<6) probe all rgba (2.0, 1.0, 1.0, 1.0)
if(sm>=6) probe all rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe all rgba (1.0, 1.0, 1.0, 1.0)

View File

@ -13,7 +13,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (4.0, 0.0, 0.0, 0.0) probe all rgba (4.0, 0.0, 0.0, 0.0)
@ -27,8 +27,8 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint 0 uniform 0 uint 0
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (-0.125, -0.375, 0.375, -0.125) probe all rgba (-0.125, -0.375, 0.375, -0.125)
uniform 0 uint 2 uniform 0 uint 2
todo(sm<6 | glsl) draw quad todo(sm<6) draw quad
probe all rgba (-0.375, 0.125, 0.125, 0.375) probe all rgba (-0.375, 0.125, 0.125, 0.375)