wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Add a hlsl_block_add_if() helper.

Browse Source
This commit is contained in:
Elizabeth Figura
2024-12-09 15:06:44 -06:00
committed by Henri Verbeet
parent 20aa37237d
commit 62196b2bf1
Notes: Henri Verbeet 2025-03-10 15:23:02 +01:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1404
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,7 +451,7 @@ static uint32_t add_modifiers(struct hlsl_ctx *ctx, uint32_t modifiers, uint32_t
static bool append_conditional_break(struct hlsl_ctx *ctx, struct hlsl_block *cond_block)
{
struct hlsl_ir_node *condition, *cast, *not, *iff;
struct hlsl_ir_node *condition, *cast, *not;
struct hlsl_block then_block;
struct hlsl_type *bool_type;
@@ -473,10 +473,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct hlsl_block *co
hlsl_block_init(&then_block);
hlsl_block_add_jump(ctx, &then_block, HLSL_IR_JUMP_BREAK, NULL, &condition->loc);
if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &condition->loc)))
return false;
hlsl_block_add_instr(cond_block, iff);
hlsl_block_add_if(ctx, cond_block, not, &then_block, NULL, &condition->loc);
return true;
}
@@ -8990,7 +8987,6 @@ selection_statement:
{
struct hlsl_ir_node *condition = node_from_block($4);
const struct parse_attribute_list *attributes = &$1;
struct hlsl_ir_node *instr;
unsigned int i;
check_attribute_list_for_duplicates(ctx, attributes);
@@ -9020,19 +9016,13 @@ selection_statement:
YYABORT;
}
if (!(instr = hlsl_new_if(ctx, condition, $6.then_block, $6.else_block, &@2)))
{
destroy_block($6.then_block);
destroy_block($6.else_block);
cleanup_parse_attribute_list(&$1);
YYABORT;
}
hlsl_block_add_if(ctx, $4, condition, $6.then_block, $6.else_block, &@2);
destroy_block($6.then_block);
destroy_block($6.else_block);
cleanup_parse_attribute_list(&$1);
$$ = $4;
hlsl_block_add_instr($$, instr);
}
if_body: