wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Adjust arithmetic-int.shader_test to pass with 1.x.

Browse Source 
Pixel shader 1.x constants must be between -1 and 1, or they will be clamped,
even constants defined in the shader.

Also mark 1.x-specific features if any.
This commit is contained in:
Elizabeth Figura 2024-12-18 00:21:35 -06:00 committed by Henri Verbeet
parent fb75c0530a
commit e40b191943
Notes: Henri Verbeet 2025-01-22 15:03:30 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1324
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/hlsl/arithmetic-int.shader_test
View File

@ -4,12 +4,12 @@ float4 main() : SV_TARGET
int x = 5; int x = 5;
int y = 15; int y = 15;
return float4(x + y, x - y, x * y, x / y); return float4(x + y, x - y, x * y, x / y) / 100.0;
} }
[test] [test]
draw quad draw quad
probe (0, 0) rgba (20.0, -10.0, 75.0, 0.0) probe (0, 0) rgba (0.20, -0.10, 0.75, 0.0) 1
[pixel shader] [pixel shader]
float4 main() : SV_TARGET float4 main() : SV_TARGET
@ -17,12 +17,12 @@ float4 main() : SV_TARGET
int x = 5; int x = 5;
int y = 15; int y = 15;
return float4(x % y, +x, -x, y / x); return float4(x % y, +x, -x, y / x) / 10.0;
} }
[test] [test]
draw quad draw quad
probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) probe (0, 0) rgba (0.5, 0.5, -0.5, 0.3)
[pixel shader] [pixel shader]
float4 main() : SV_TARGET float4 main() : SV_TARGET
@ -30,12 +30,12 @@ float4 main() : SV_TARGET
int x = 42; int x = 42;
int y = 5; int y = 5;
return float4(x / y, -x / y, x / -y, -x / -y); return float4(x / y, -x / y, x / -y, -x / -y) / 10.0;
} }
[test] [test]
draw quad draw quad
probe (0, 0) rgba (8.0, -8.0, -8.0, 8.0) probe (0, 0) rgba (0.8, -0.8, -0.8, 0.8)
[pixel shader] [pixel shader]
float4 main() : SV_TARGET float4 main() : SV_TARGET
@ -43,12 +43,12 @@ float4 main() : SV_TARGET
int x = 42; int x = 42;
int y = 5; int y = 5;
return float4(x % y, -x % y, x % -y, -x % -y); return float4(x % y, -x % y, x % -y, -x % -y) / 10.0;
} }
[test] [test]
draw quad draw quad
probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) probe (0, 0) rgba (0.2, -0.2, 0.2, -0.2)
[pixel shader] [pixel shader]
float4 main() : SV_TARGET float4 main() : SV_TARGET
@ -56,12 +56,12 @@ float4 main() : SV_TARGET
int x = 45; int x = 45;
int y = 5; int y = 5;
return float4(x / y, -x / y, x / -y, -x / -y); return float4(x / y, -x / y, x / -y, -x / -y) / 10.0;
} }
[test] [test]
draw quad draw quad
probe (0, 0) rgba (9.0, -9.0, -9.0, 9.0) probe (0, 0) rgba (0.9, -0.9, -0.9, 0.9) 1
[pixel shader] [pixel shader]
float4 main() : SV_TARGET float4 main() : SV_TARGET
@ -76,8 +76,7 @@ float4 main() : SV_TARGET
draw quad draw quad
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader fail(sm<6)] [pixel shader fail(sm>=2&sm<6)]
// On SM1 this gives hr 0x88760b59.
float4 main() : SV_TARGET float4 main() : SV_TARGET
{ {
int x = 1; int x = 1;
@ -90,8 +89,8 @@ float4 main() : SV_TARGET
draw quad draw quad
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader fail(sm<6)] % Allowed regardless of shader model on 31 and below
// On SM1 this gives hr 0x88760b59. [pixel shader fail(sm>=2&sm<6)]
float4 main() : SV_TARGET float4 main() : SV_TARGET
{ {
int x = 1; int x = 1;
@ -106,7 +105,8 @@ probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[require] [require]
shader model >= 4.0 % Skip 1.x because of clamping.
shader model >= 2.0
[pixel shader] [pixel shader]
float4 main() : SV_TARGET float4 main() : SV_TARGET
@ -119,7 +119,8 @@ float4 main() : SV_TARGET
[test] [test]
draw quad draw quad
if(sm<6) probe (0,0) rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) if(sm<4) todo probe (0,0) rgba ( 2147483648.0, 2147483648.0, 2147483648.0, 2147483648.0)
if(sm>=4&sm<6) probe (0,0) rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0)
if(sm>=6) probe (0,0) rgba (0.0, 0.0, 0.0, 0.0) if(sm>=6) probe (0,0) rgba (0.0, 0.0, 0.0, 0.0)