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

vkd3d-shader/spirv: Handle the ACOS, ASIN and ATAN instructions in spirv_compiler_emit_ext_glsl_instruction().

Browse Source
This commit is contained in:
Conor McCarthy 2024-01-22 16:00:47 +10:00 committed by Alexandre Julliard
parent 19d23fa696
commit 7f87a3e5fc
Notes: Alexandre Julliard 2024-02-06 23:43:29 +01:00 
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/602
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/spirv.c
View File

@ -6997,6 +6997,9 @@ static enum GLSLstd450 spirv_compiler_map_ext_glsl_instruction(
}
glsl_insts[] =
{
{VKD3DSIH_ACOS, GLSLstd450Acos},
{VKD3DSIH_ASIN, GLSLstd450Asin},
{VKD3DSIH_ATAN, GLSLstd450Atan},
{VKD3DSIH_DFMA, GLSLstd450Fma},
{VKD3DSIH_DMAX, GLSLstd450NMax},
{VKD3DSIH_DMIN, GLSLstd450NMin},
@ -9581,6 +9584,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_ISFINITE:
spirv_compiler_emit_isfinite(compiler, instruction);
break;
case VKD3DSIH_ACOS:
case VKD3DSIH_ASIN:
case VKD3DSIH_ATAN:
case VKD3DSIH_DFMA:
case VKD3DSIH_DMAX:
case VKD3DSIH_DMIN:

60
tests/hlsl/inverse-trig.shader_test
View File

@ -13,23 +13,23 @@ float4 main() : sv_target
[test]
uniform 0 float4 -1.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (3.14159274, 0.0, 0.0, 0.0) 128
uniform 0 float4 -0.5 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (2.094441441, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (1.57072878, 0.0, 0.0, 0.0) 1024
uniform 0 float4 0.5 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (1.04715133, 0.0, 0.0, 0.0) 512
uniform 0 float4 1.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0) 128
[pixel shader todo]
@ -44,7 +44,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -1.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (-31416.0, 0.0, 0.0, 0.0)
[require]
@ -72,15 +72,15 @@ shader model >= 6.0
% RADV are a bit lower than these, hence the large max ulp difference.
[test]
uniform 0 float4 -0.5 0.0 0.0 0.0
todo draw quad
draw quad
probe all rgba (-10472.0, 0.0, 0.0, 0.0) 4096
uniform 0 float4 0.0 0.0 0.0 0.0
todo draw quad
draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
uniform 0 float4 0.5 0.0 0.0 0.0
todo draw quad
draw quad
probe all rgba (10472.0, 0.0, 0.0, 0.0) 4096
[require]
@ -88,7 +88,7 @@ probe all rgba (10472.0, 0.0, 0.0, 0.0) 4096
[test]
uniform 0 float4 1.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (31416.0, 0.0, 0.0, 0.0)
@ -102,23 +102,23 @@ float4 main() : sv_target
[test]
uniform 0 float4 -1.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (-0.785409629, 0.0, 0.0, 0.0) 512
uniform 0 float4 -0.5 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (-0.4636476, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.5 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (0.4636476, 0.0, 0.0, 0.0) 256
uniform 0 float4 1.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (0.785409629, 0.0, 0.0, 0.0) 512
[pixel shader todo]
@ -133,64 +133,64 @@ float4 main() : sv_target
[test]
% Non-degenerate cases
uniform 0 float4 1.0 1.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (0.785385, 0.0, 0.0, 0.0) 512
uniform 0 float4 5.0 -5.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (2.356194, 0.0, 0.0, 0.0) 256
uniform 0 float4 -3.0 -3.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (-2.356194, 0.0, 0.0, 0.0) 256
uniform 0 float4 1.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (1.570796, 0.0, 0.0, 0.0) 256
uniform 0 float4 -1.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (-1.570796, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 1.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 -1.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256
% Degenerate cases
uniform 0 float4 0.00001 0.00002 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (0.463647, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.00001 -0.00002 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (2.677945, 0.0, 0.0, 0.0) 256
uniform 0 float4 -0.00001 100000.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048
uniform 0 float4 10000000.0 0.00000001 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (1.570796, 0.0, 0.0, 0.0) 256
% Negative zero behavior should be to treat it the
% same as normal zero.
uniform 0 float4 1000000000.0 0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (1.570796, 0.0, 0.0, 0.0) 256
uniform 0 float4 1000000000.0 -0.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (1.570796, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 -1.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256
uniform 0 float4 -0.0 -1.0 0.0 0.0
todo draw quad
todo(sm<6) draw quad
probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256