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: Add an add_switch() helper.

Browse Source
This commit is contained in:
Elizabeth Figura
2024-12-07 19:23:51 -06:00
committed by Henri Verbeet
parent 2f77d56b77
commit fb290f3847
Notes: Henri Verbeet 2025-02-05 14:07:07 +01:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1365
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6889,6 +6889,38 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls
}
}
static bool add_switch(struct hlsl_ctx *ctx, struct hlsl_block *block,
struct parse_attribute_list *attributes, struct list *cases, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_node *selector = node_from_block(block);
struct hlsl_ir_node *s;
if (!(selector = add_implicit_conversion(ctx, block, selector,
hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &selector->loc)))
{
destroy_switch_cases(cases);
destroy_block(block);
cleanup_parse_attribute_list(attributes);
return false;
}
s = hlsl_new_switch(ctx, selector, cases, loc);
destroy_switch_cases(cases);
if (!s)
{
destroy_block(block);
cleanup_parse_attribute_list(attributes);
return false;
}
hlsl_block_add_instr(block, s);
cleanup_parse_attribute_list(attributes);
return true;
}
static void validate_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim,
struct hlsl_type *format, const struct vkd3d_shader_location* loc)
{
@ -9237,33 +9269,10 @@ loop_statement:
switch_statement:
attribute_list_optional switch_scope_start KW_SWITCH '(' expr ')' '{' switch_cases '}'
{
struct hlsl_ir_node *selector = node_from_block($5);
struct hlsl_ir_node *s;
if (!(selector = add_implicit_conversion(ctx, $5, selector, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &@5)))
{
destroy_switch_cases($8);
destroy_block($5);
cleanup_parse_attribute_list(&$1);
YYABORT;
}
s = hlsl_new_switch(ctx, selector, $8, &@3);
destroy_switch_cases($8);
if (!s)
{
destroy_block($5);
cleanup_parse_attribute_list(&$1);
YYABORT;
}
$$ = $5;
hlsl_block_add_instr($$, s);
if (!add_switch(ctx, $$, &$1, $8, &@3))
YYABORT;
hlsl_pop_scope(ctx);
cleanup_parse_attribute_list(&$1);
}
switch_case: