wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/msl: Handle VSIR_DATA_BOOL operands.

Browse Source
This commit is contained in:
Henri Verbeet
2025-09-02 20:57:51 +02:00
parent 72071fcf08
commit 007792c33b
Notes: Henri Verbeet 2025-09-19 12:54:20 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1740
28 changed files with 178 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/hlsl/conditional.shader_test
View File

@@ -11,10 +11,10 @@ float4 main() : sv_target
[test]
uniform 0 float4 0.0 0.0 0.0 0.0
todo(sm<4 | msl & sm>=6) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
uniform 0 float4 0.1 0.0 0.0 0.0
todo(sm<4 | msl & sm>=6) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
[pixel shader todo(sm<4)]
@@ -43,7 +43,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 0.0 0.0 0.0 0.0
todo(sm<4 | msl & sm>=6) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
[pixel shader fail(sm<6)]
@@ -87,13 +87,12 @@ float4 main() : sv_target
[test]
uniform 0 float -2
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (1, 2, 3, 4)
uniform 0 float 10
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (10, 20, 30, 40)
[pixel shader]
uniform float4 u;
@@ -108,7 +107,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 0.0 0.0 0.0 0.0
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
[pixel shader]
@@ -145,22 +144,21 @@ if(sm<4) uniform 0 float 8
if(sm<4) uniform 4 float 9
if(sm>=4) uniform 0 int 8
if(sm>=4) uniform 1 int 9
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0)
if(sm<4) uniform 0 float -3
if(sm<4) uniform 4 float -4
if(sm>=4) uniform 0 int -3
if(sm>=4) uniform 1 int -4
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
if(sm<4) uniform 0 float 7
if(sm<4) uniform 4 float 7
if(sm>=4) uniform 0 int 7
if(sm>=4) uniform 1 int 7
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
[pixel shader]
int a, b;
@@ -177,22 +175,21 @@ if(sm<4) uniform 0 float 8
if(sm<4) uniform 4 float 9
if(sm>=4) uniform 0 int 8
if(sm>=4) uniform 1 int 9
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0)
if(sm<4) uniform 0 float -3
if(sm<4) uniform 4 float -4
if(sm>=4) uniform 0 int -3
if(sm>=4) uniform 1 int -4
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
if(sm<4) uniform 0 float 7
if(sm<4) uniform 4 float 7
if(sm>=4) uniform 0 int 7
if(sm>=4) uniform 1 int 7
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0)
[pixel shader]
int a, b;
@@ -209,16 +206,15 @@ if(sm<4) uniform 0 float -3
if(sm<4) uniform 4 float -2
if(sm>=4) uniform 0 int -3
if(sm>=4) uniform 1 int -2
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0)
if(sm<4) uniform 0 float 4
if(sm<4) uniform 4 float 4
if(sm>=4) uniform 0 int 4
if(sm>=4) uniform 1 int 4
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
% Test "if" conditionals, using resource loads to ensure we aren't removing these instruction with optimizations.
[srv 0]
size (2d, 2, 2)
@@ -243,13 +239,12 @@ float4 main() : sv_target
[test]
uniform 0 float -2
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (0.0, 0.0, 0.0, 4.0)
uniform 0 float 4
todo(msl & sm>=6) draw quad
draw quad
probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader]
Texture2D tex;
sampler sam;