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: Introduce add_cast() helper.

Browse Source 
Signed-off-by: Giovanni Mascellani <gmascellani@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-06-07 16:29:19 -05:00 committed by Alexandre Julliard
parent 8cd4995958
commit e37ac63813
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,7 +266,7 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ
return false; return false;
} }
static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct list *instrs, static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs,
struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc) struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc)
{ {
struct hlsl_type *src_type = node->data_type; struct hlsl_type *src_type = node->data_type;
@ -275,6 +275,17 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct
if (hlsl_types_are_equal(src_type, dst_type)) if (hlsl_types_are_equal(src_type, dst_type))
return node; return node;
if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc)))
return NULL;
list_add_tail(instrs, &cast->node.entry);
return &cast->node;
}
static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct list *instrs,
struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc)
{
struct hlsl_type *src_type = node->data_type;
if (!implicit_compatible_data_types(src_type, dst_type)) if (!implicit_compatible_data_types(src_type, dst_type))
{ {
struct vkd3d_string_buffer *src_string, *dst_string; struct vkd3d_string_buffer *src_string, *dst_string;
@ -293,10 +304,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct
hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, "Implicit truncation of %s type.", hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, "Implicit truncation of %s type.",
src_type->type == HLSL_CLASS_VECTOR ? "vector" : "matrix"); src_type->type == HLSL_CLASS_VECTOR ? "vector" : "matrix");
if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) return add_cast(ctx, instrs, node, dst_type, loc);
return NULL;
list_add_tail(instrs, &cast->node.entry);
return &cast->node;
} }
static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, const struct vkd3d_shader_location loc) static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, const struct vkd3d_shader_location loc)
@ -3718,7 +3726,6 @@ unary_expr:
{ {
struct hlsl_type *src_type = node_from_list($6)->data_type; struct hlsl_type *src_type = node_from_list($6)->data_type;
struct hlsl_type *dst_type; struct hlsl_type *dst_type;
struct hlsl_ir_expr *cast;
unsigned int i; unsigned int i;
if ($2) if ($2)
@ -3746,12 +3753,11 @@ unary_expr:
YYABORT; YYABORT;
} }
if (!(cast = hlsl_new_cast(ctx, node_from_list($6), dst_type, &@3))) if (!add_cast(ctx, $6, node_from_list($6), dst_type, &@3))
{ {
hlsl_free_instr_list($6); hlsl_free_instr_list($6);
YYABORT; YYABORT;
} }
list_add_tail($6, &cast->node.entry);
$$ = $6; $$ = $6;
} }