wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Do not abort when performing an invalid explicit cast.

Browse Source
This commit is contained in:
Elizabeth Figura 2024-12-09 17:29:13 -06:00 committed by Henri Verbeet
parent 25f476c7ad
commit 2ee19c4d34
Notes: Henri Verbeet 2025-03-12 22:21:12 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Francisco Casas (@fcasas)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1413
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,7 +395,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct
return add_cast(ctx, block, node, dst_type, loc);
}
static bool add_explicit_conversion(struct hlsl_ctx *ctx, struct hlsl_block *block,
static void add_explicit_conversion(struct hlsl_ctx *ctx, struct hlsl_block *block,
struct hlsl_type *dst_type, const struct parse_array_sizes *arrays, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_node *instr = node_from_block(block);
@ -414,7 +414,7 @@ static bool add_explicit_conversion(struct hlsl_ctx *ctx, struct hlsl_block *blo
}
if (instr->data_type->class == HLSL_CLASS_ERROR)
return true;
return;
if (!explicit_compatible_data_types(ctx, src_type, dst_type))
{
@ -427,10 +427,9 @@ static bool add_explicit_conversion(struct hlsl_ctx *ctx, struct hlsl_block *blo
src_string->buffer, dst_string->buffer);
hlsl_release_string_buffer(ctx, src_string);
hlsl_release_string_buffer(ctx, dst_string);
return false;
}
return add_cast(ctx, block, instr, dst_type, loc);
add_cast(ctx, block, instr, dst_type, loc);
}
static uint32_t add_modifiers(struct hlsl_ctx *ctx, uint32_t modifiers, uint32_t mod,
@ -9408,12 +9407,7 @@ unary_expr:
hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Modifiers are not allowed on casts.");
if (!add_explicit_conversion(ctx, $6, $3, &$4, &@3))
{
destroy_block($6);
vkd3d_free($4.sizes);
YYABORT;
}
add_explicit_conversion(ctx, $6, $3, &$4, &@3);
vkd3d_free($4.sizes);
$$ = $6;
}