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 floor().

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2022-02-02 13:46:15 +01:00 committed by Alexandre Julliard
parent 11d962ddbf
commit 4e36c1825d
5 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -57,6 +57,7 @@ vkd3d_shader_tests = \
tests/cast-to-int.shader_test \
tests/cast-to-uint.shader_test \
tests/conditional.shader_test \
tests/floor.shader_test \
tests/hlsl-array-dimension.shader_test \
tests/hlsl-bool-cast.shader_test \
tests/hlsl-clamp.shader_test \

1
libs/vkd3d-shader/hlsl.h
View File

@ -293,6 +293,7 @@ enum hlsl_ir_expr_op
HLSL_OP1_DSX,
HLSL_OP1_DSY,
HLSL_OP1_EXP2,
HLSL_OP1_FLOOR,
HLSL_OP1_FRACT,
HLSL_OP1_LOG2,
HLSL_OP1_LOGIC_NOT,

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

@ -1653,6 +1653,17 @@ static bool intrinsic_cross(struct hlsl_ctx *ctx,
return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, &mul2->node, mul1_neg, loc);
}
static bool intrinsic_floor(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_node *arg;
if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc)))
return false;
return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_FLOOR, arg, loc);
}
static bool intrinsic_max(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{
@ -1720,6 +1731,7 @@ intrinsic_functions[] =
{"abs", 1, true, intrinsic_abs},
{"clamp", 3, true, intrinsic_clamp},
{"cross", 2, true, intrinsic_cross},
{"floor", 1, true, intrinsic_floor},
{"max", 2, true, intrinsic_max},
{"min", 2, true, intrinsic_min},
{"pow", 2, true, intrinsic_pow},

4
libs/vkd3d-shader/hlsl_sm4.c
View File

@ -1432,6 +1432,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx,
write_sm4_unary_op(buffer, VKD3D_SM4_OP_EXP, &expr->node, arg1, 0);
break;
case HLSL_OP1_FLOOR:
write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NI, &expr->node, arg1, 0);
break;
case HLSL_OP1_LOG2:
write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0);
break;

38
tests/floor.shader_test Normal file
View File

@ -0,0 +1,38 @@
[pixel shader]
float4 main(uniform float4 u) : sv_target
{
return floor(u);
}
[test]
uniform 0 float4 -0.5 6.5 7.5 3.4
draw quad
probe all rgba (-1.0, 6.0, 7.0, 3.0) 4
[pixel shader]
float4 main(uniform float4 u) : sv_target
{
float a = floor(u.r);
int2 b = floor(u.gb);
float4 res = float4(b, a, u.a);
return floor(res);
}
[test]
uniform 0 float4 -0.5 6.5 7.5 3.4
draw quad
probe all rgba (6.0, 7.0, -1.0, 3.0) 4
[pixel shader]
float4 main(uniform int4 u) : sv_target
{
float a = floor(u.r);
int2 b = floor(u.gb);
float4 res = float4(b, a, u.a);
return floor(res);
}
[test]
uniform 0 int4 -1 6 7 3
draw quad
probe all rgba (6.0, 7.0, -1.0, 3.0) 4