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: Parse bitwise AND.

Browse Source 
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Francisco Casas <fcasas@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Giovanni Mascellani 2022-02-11 21:04:07 +01:00 committed by Alexandre Julliard
parent 52a3e0af55
commit c0ff9184cf
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1057,6 +1057,49 @@ static struct list *add_binary_arithmetic_expr_merge(struct hlsl_ctx *ctx, struc
return list1; return list1;
} }
static struct hlsl_ir_expr *add_binary_bitwise_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)
{
if (arg1->data_type->base_type != HLSL_TYPE_INT && arg1->data_type->base_type != HLSL_TYPE_UINT
&& arg1->data_type->base_type != HLSL_TYPE_BOOL)
{
struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg1->data_type);
if (type_str)
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
"The first argument has type '%s', which is not integer.", type_str->buffer);
hlsl_release_string_buffer(ctx, type_str);
return NULL;
}
if (arg2->data_type->base_type != HLSL_TYPE_INT && arg2->data_type->base_type != HLSL_TYPE_UINT
&& arg2->data_type->base_type != HLSL_TYPE_BOOL)
{
struct vkd3d_string_buffer *type_str = hlsl_type_to_string(ctx, arg2->data_type);
if (type_str)
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
"The second argument has type '%s', which is not integer.", type_str->buffer);
hlsl_release_string_buffer(ctx, type_str);
return NULL;
}
return add_binary_arithmetic_expr(ctx, instrs, op, arg1, arg2, loc);
}
static struct list *add_binary_bitwise_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct list *list2,
enum hlsl_ir_expr_op op, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2);
list_move_tail(list1, list2);
vkd3d_free(list2);
add_binary_bitwise_expr(ctx, list1, op, arg1, arg2, loc);
return list1;
}
static struct hlsl_ir_expr *add_binary_comparison_expr(struct hlsl_ctx *ctx, struct list *instrs, static struct hlsl_ir_expr *add_binary_comparison_expr(struct hlsl_ctx *ctx, struct list *instrs,
enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2,
struct vkd3d_shader_location *loc) struct vkd3d_shader_location *loc)
@ -3600,7 +3643,7 @@ bitand_expr:
equality_expr equality_expr
| bitand_expr '&' equality_expr | bitand_expr '&' equality_expr
{ {
hlsl_fixme(ctx, &@$, "Bitwise AND."); $$ = add_binary_bitwise_expr_merge(ctx, $1, $3, HLSL_OP2_BIT_AND, &@2);
} }
bitxor_expr: bitxor_expr: