vkd3d-shader/hlsl: Convert elementwise intrinsics args to the proper common type.

This commit is contained in:
Francisco Casas
2022-11-07 19:05:52 -03:00
committed by Alexandre Julliard
parent 86c35fc79d
commit 9ceed76a9c
Notes: Alexandre Julliard 2023-01-11 22:39:00 +01:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/53
7 changed files with 126 additions and 33 deletions

View File

@@ -10,7 +10,7 @@ draw quad
probe all rgba (-0.1, 0.7, -0.3, 0.3)
[pixel shader todo]
[pixel shader]
float4 main() : sv_target
{
float3x2 a = {6, 5, 4, 3, 2, 1};
@@ -22,11 +22,11 @@ float4 main() : sv_target
}
[test]
todo draw quad
todo probe all rgba (5.5, 5.0, 4.2, 5.2)
draw quad
probe all rgba (5.5, 5.0, 4.2, 5.2)
[pixel shader fail todo]
[pixel shader fail]
float4 main() : sv_target
{
float2x2 a = {3.1, 3.1, 3.1, 3.1};

View File

@@ -32,7 +32,7 @@ draw quad
probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030)
[pixel shader todo]
[pixel shader]
float4 main() : sv_target
{
float2x3 a = {1, 2, 3, 4, 5, 6};
@@ -43,11 +43,11 @@ float4 main() : sv_target
}
[test]
todo draw quad
todo probe all rgba (64.0, 64.0, 64.0, 40.0)
draw quad
probe all rgba (64.0, 64.0, 64.0, 40.0)
[pixel shader fail todo]
[pixel shader fail]
float4 main() : sv_target
{
float2x2 a = {1, 2, 3, 4};

View File

@@ -36,7 +36,7 @@ draw quad
probe all rgba (2.0, -10.0, -2.0, 1e12)
[pixel shader todo]
[pixel shader]
float4 main() : sv_target
{
float3x2 a = {6, 5, 4, 3, 2, 1};
@@ -48,11 +48,11 @@ float4 main() : sv_target
}
[test]
todo draw quad
todo probe all rgba (-6.0, -2.2, 4.48, 8.28)
draw quad
probe all rgba (-6.0, -2.2, 4.48, 8.28) 1
[pixel shader fail todo]
[pixel shader fail]
float4 main() : sv_target
{
float2x2 a = {0, 1, 2, 3};

View File

@@ -93,7 +93,7 @@ draw quad
probe all rgba (1.0, 1.0, 0, 0) 1
[pixel shader todo]
[pixel shader]
float4 main() : sv_target
{
float2x3 a = {1, 1, 1, 1, 1, 1};
@@ -105,8 +105,8 @@ float4 main() : sv_target
}
[test]
todo draw quad
todo probe all rgba (0.028, 0.104, 0.216, 0.352) 1
draw quad
probe all rgba (0.028, 0.104, 0.216, 0.352) 6
[pixel shader]
@@ -138,7 +138,7 @@ draw quad
probe all rgba (0.5, 0.5, 0.5, 0.0)
[pixel shader todo]
[pixel shader]
float4 main() : sv_target
{
float4x1 a = {0.0, 0.0, 0.0, 0.0};
@@ -150,11 +150,11 @@ float4 main() : sv_target
}
[test]
todo draw quad
todo probe all rgba (0.5, 0.5, 0.5, 0.5)
draw quad
probe all rgba (0.5, 0.5, 0.5, 0.5)
[pixel shader fail todo]
[pixel shader fail]
float4 main() : sv_target
{
float2x2 a = {0.0, 0.0, 0.0, 0.0};

View File

@@ -24,7 +24,7 @@ draw quad
probe all rgba (0.7, 0.8, 0.7, 0.2)
[pixel shader todo]
[pixel shader]
float4 main() : sv_target
{
float2x3 a = {1, 2, 3, 4, 5, 6};
@@ -35,11 +35,11 @@ float4 main() : sv_target
}
[test]
todo draw quad
todo probe all rgba (6.0, 5.0, 4.0, 5.0)
draw quad
probe all rgba (6.0, 5.0, 4.0, 5.0)
[pixel shader fail todo]
[pixel shader fail]
float4 main() : sv_target
{
float2x2 a = {1, 2, 3, 4};

View File

@@ -25,7 +25,7 @@ todo draw quad
todo probe all rgba (1.0, 32.0, 256.0, 125.0)
[pixel shader fail todo]
[pixel shader fail]
float4 main() : sv_target
{
float2x2 a = {1, 2, 3, 4};