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: Add support for any() intrinsic.

Browse Source 
For now, this is limited to float and bool, scalar and vector. All other types are unsupported.

Signed-off-by: Ethan Lee <flibitijibibo@gmail.com>
This commit is contained in:
Ethan Lee 2023-04-06 23:59:04 -04:00 committed by Alexandre Julliard
parent 3f9cd58f5b
commit 0668d32631
Notes: Alexandre Julliard 2023-04-19 22:12:42 +02: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/157
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2435,6 +2435,55 @@ static bool intrinsic_all(struct hlsl_ctx *ctx,
return !!add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_NEQUAL, mul, zero, loc); return !!add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_NEQUAL, mul, zero, loc);
} }
static bool intrinsic_any(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_node *arg = params->args[0], *dot, *or, *zero, *bfalse;
struct hlsl_ir_load *load;
unsigned int i, count;
if (arg->data_type->class != HLSL_CLASS_VECTOR && arg->data_type->class != HLSL_CLASS_SCALAR)
{
hlsl_fixme(ctx, loc, "any() implementation for non-vector, non-scalar");
return false;
}
if (arg->data_type->base_type == HLSL_TYPE_FLOAT)
{
if (!(zero = hlsl_new_float_constant(ctx, 0.0f, loc)))
return false;
list_add_tail(params->instrs, &zero->entry);
if (!(dot = add_binary_dot_expr(ctx, params->instrs, arg, arg, loc)))
return false;
return !!add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_NEQUAL, dot, zero, loc);
}
else if (arg->data_type->base_type == HLSL_TYPE_BOOL)
{
if (!(bfalse = hlsl_new_bool_constant(ctx, false, loc)))
return false;
list_add_tail(params->instrs, &bfalse->entry);
or = bfalse;
count = hlsl_type_component_count(arg->data_type);
for (i = 0; i < count; ++i)
{
if (!(load = add_load_component(ctx, params->instrs, arg, i, loc)))
return false;
if (!(or = add_binary_bitwise_expr(ctx, params->instrs, HLSL_OP2_BIT_OR, or, &load->node, loc)))
return false;
}
return true;
}
hlsl_fixme(ctx, loc, "any() implementation for non-float, non-bool");
return false;
}
/* Find the type corresponding to the given source type, with the same /* Find the type corresponding to the given source type, with the same
* dimensions but a different base type. */ * dimensions but a different base type. */
static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx, static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx,
@ -3284,6 +3333,7 @@ intrinsic_functions[] =
/* Note: these entries should be kept in alphabetical order. */ /* Note: these entries should be kept in alphabetical order. */
{"abs", 1, true, intrinsic_abs}, {"abs", 1, true, intrinsic_abs},
{"all", 1, true, intrinsic_all}, {"all", 1, true, intrinsic_all},
{"any", 1, true, intrinsic_any},
{"asuint", -1, true, intrinsic_asuint}, {"asuint", -1, true, intrinsic_asuint},
{"clamp", 3, true, intrinsic_clamp}, {"clamp", 3, true, intrinsic_clamp},
{"cos", 1, true, intrinsic_cos}, {"cos", 1, true, intrinsic_cos},