wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Implement the sincos() intrinsic.

Browse Source
This commit is contained in:
Petrichor Park 2024-08-19 12:57:50 -05:00 committed by Henri Verbeet
parent 384810b4ba
commit 855b9713b8
Notes: Henri Verbeet 2024-09-04 18:49:35 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1009
2 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/vkd3d-shader/hlsl.y
View File

@ -4489,6 +4489,35 @@ static bool intrinsic_sin(struct hlsl_ctx *ctx,
return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SIN, arg, loc); return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SIN, arg, loc);
} }
static bool intrinsic_sincos(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_function_decl *func;
struct hlsl_type *type;
char *body;
static const char template[] =
"void sincos(%s f, out %s s, out %s c)\n"
"{\n"
" s = sin(f);\n"
" c = cos(f);\n"
"}";
if (!elementwise_intrinsic_float_convert_args(ctx, params, loc))
return false;
type = params->args[0]->data_type;
if (!(body = hlsl_sprintf_alloc(ctx, template,
type->name, type->name, type->name)))
return false;
func = hlsl_compile_internal_function(ctx, "sincos", body);
vkd3d_free(body);
if (!func)
return false;
return !!add_user_call(ctx, func, params, false, loc);
}
static bool intrinsic_sinh(struct hlsl_ctx *ctx, static bool intrinsic_sinh(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc) const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{ {
@ -5041,6 +5070,7 @@ intrinsic_functions[] =
{"saturate", 1, true, intrinsic_saturate}, {"saturate", 1, true, intrinsic_saturate},
{"sign", 1, true, intrinsic_sign}, {"sign", 1, true, intrinsic_sign},
{"sin", 1, true, intrinsic_sin}, {"sin", 1, true, intrinsic_sin},
{"sincos", 3, true, intrinsic_sincos},
{"sinh", 1, true, intrinsic_sinh}, {"sinh", 1, true, intrinsic_sinh},
{"smoothstep", 3, true, intrinsic_smoothstep}, {"smoothstep", 3, true, intrinsic_smoothstep},
{"sqrt", 1, true, intrinsic_sqrt}, {"sqrt", 1, true, intrinsic_sqrt},

47
tests/hlsl/trigonometry.shader_test
View File

@ -126,3 +126,50 @@ probe (0, 0) rgba (-0.91715234, -0.5, 0.5, 0.91715234) 2
uniform 0 float4 -10.0 -0.0 0.0 10.0 uniform 0 float4 -10.0 -0.0 0.0 10.0
todo(glsl) draw quad todo(glsl) draw quad
probe (0, 0) rgba (-1.0, 0.0, 0.0, 1.0) 1 probe (0, 0) rgba (-1.0, 0.0, 0.0, 1.0) 1
[pixel shader]
uniform float4 a;
float4 main() : sv_target
{
float sin_out, cos_out;
sincos(a.x, sin_out, cos_out);
return float4(sin_out, cos_out, 0.0, 0.0);
}
[test]
uniform 0 float4 7.604 0 0 0
todo(glsl) draw quad
probe (0, 0) rgba (0.968916833, 0.2473865, 0, 0) 1024
uniform 0 float4 -10.0 0 0 0
todo(glsl) draw quad
probe (0, 0) rgba (0.544020891, -0.839071631, 0.0, 0.0) 1024
[pixel shader fail]
float4 main() : sv_target
{
// Make sure `out` variables don't work with literals
sincos(12345.0, 10.0, 20.0);
return float4(6789);
[pixel shader fail]
float4 main() : sv_target
{
// sincos returns void.
float s, c;
float err = sincos(12345.0, s, c);
return float4(6789);
}
[pixel shader todo]
float4 main() : sv_target
{
int sin_out, cos_out;
sincos(30, sin_out, cos_out);
return float4(sin_out, cos_out, 0, 0);
}
[test]
todo(sm<6 | glsl) draw quad
probe (0, 0) rgba (0, 0, 0, 0);