[PATCH vkd3d v2 7/7] vkd3d-shader/hlsl: Fix typing rules for logical NOT.

[Francisco Casas]

Signed-off-by: Francisco Casas <fcasas at codeweavers.com>


February 24, 2022 3:45 PM, "Zebediah Figura" <zfigura at codeweavers.com> wrote:

> From: Giovanni Mascellani <gmascellani at codeweavers.com>
> 
> Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
> Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
> ---
> v2: Constify the "loc" parameter.
> 
> libs/vkd3d-shader/hlsl.y | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
> index 328f1bbb1..92dcb3f2a 100644
> --- a/libs/vkd3d-shader/hlsl.y
> +++ b/libs/vkd3d-shader/hlsl.y
> @@ -1051,6 +1051,21 @@ static struct hlsl_ir_expr *add_unary_bitwise_expr(struct hlsl_ctx *ctx,
> struct
> return add_unary_arithmetic_expr(ctx, instrs, op, arg, loc);
> }
> 
> +static struct hlsl_ir_expr *add_unary_logical_expr(struct hlsl_ctx *ctx, struct list *instrs,
> + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc)
> +{
> + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0};
> + struct hlsl_type *bool_type;
> +
> + bool_type = hlsl_get_numeric_type(ctx, arg->data_type->type, HLSL_TYPE_BOOL,
> + arg->data_type->dimx, arg->data_type->dimy);
> +
> + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg, bool_type, loc)))
> + return NULL;
> +
> + return add_expr(ctx, instrs, op, args, bool_type, loc);
> +}
> +
> static struct hlsl_ir_expr *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs,
> enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2,
> const struct vkd3d_shader_location *loc)
> @@ -3608,7 +3623,7 @@ unary_expr:
> }
> | '!' unary_expr
> {
> - add_unary_arithmetic_expr(ctx, $2, HLSL_OP1_LOGIC_NOT, node_from_list($2), &@1);
> + add_unary_logical_expr(ctx, $2, HLSL_OP1_LOGIC_NOT, node_from_list($2), &@1);
> $$ = $2;
> }
> /* var_modifiers is necessary to avoid shift/reduce conflicts. */
> -- 
> 2.35.1