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 a hlsl_block_cleanup() helper.

Browse Source
This commit is contained in:
Zebediah Figura 2023-04-14 13:02:15 -05:00 committed by Alexandre Julliard
parent dc7514afc9
commit 733141720a
Notes: Alexandre Julliard 2023-04-18 22:35:06 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/153
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/vkd3d-shader/hlsl.c
View File

@ -553,7 +553,7 @@ static bool init_deref_from_component_index(struct hlsl_ctx *ctx, struct hlsl_bl
if (!(c = hlsl_new_uint_constant(ctx, next_index, loc))) if (!(c = hlsl_new_uint_constant(ctx, next_index, loc)))
{ {
hlsl_free_instr_list(&block->instrs); hlsl_block_cleanup(block);
return false; return false;
} }
hlsl_block_add_instr(block, &c->node); hlsl_block_add_instr(block, &c->node);
@ -1426,7 +1426,7 @@ static bool clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block,
{ {
if (!(dst = clone_instr(ctx, map, src))) if (!(dst = clone_instr(ctx, map, src)))
{ {
hlsl_free_instr_list(&dst_block->instrs); hlsl_block_cleanup(dst_block);
return false; return false;
} }
list_add_tail(&dst_block->instrs, &dst->entry); list_add_tail(&dst_block->instrs, &dst->entry);
@ -1435,7 +1435,7 @@ static bool clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block,
{ {
if (!vkd3d_array_reserve((void **)&map->instrs, &map->capacity, map->count + 1, sizeof(*map->instrs))) if (!vkd3d_array_reserve((void **)&map->instrs, &map->capacity, map->count + 1, sizeof(*map->instrs)))
{ {
hlsl_free_instr_list(&dst_block->instrs); hlsl_block_cleanup(dst_block);
return false; return false;
} }
@ -2577,6 +2577,11 @@ void hlsl_free_instr_list(struct list *list)
hlsl_free_instr(node); hlsl_free_instr(node);
} }
void hlsl_block_cleanup(struct hlsl_block *block)
{
hlsl_free_instr_list(&block->instrs);
}
static void free_ir_call(struct hlsl_ir_call *call) static void free_ir_call(struct hlsl_ir_call *call)
{ {
vkd3d_free(call); vkd3d_free(call);
@ -2598,8 +2603,8 @@ static void free_ir_expr(struct hlsl_ir_expr *expr)
static void free_ir_if(struct hlsl_ir_if *if_node) static void free_ir_if(struct hlsl_ir_if *if_node)
{ {
hlsl_free_instr_list(&if_node->then_instrs.instrs); hlsl_block_cleanup(&if_node->then_instrs);
hlsl_free_instr_list(&if_node->else_instrs.instrs); hlsl_block_cleanup(&if_node->else_instrs);
hlsl_src_remove(&if_node->condition); hlsl_src_remove(&if_node->condition);
vkd3d_free(if_node); vkd3d_free(if_node);
} }
@ -2617,7 +2622,7 @@ static void free_ir_load(struct hlsl_ir_load *load)
static void free_ir_loop(struct hlsl_ir_loop *loop) static void free_ir_loop(struct hlsl_ir_loop *loop)
{ {
hlsl_free_instr_list(&loop->body.instrs); hlsl_block_cleanup(&loop->body);
vkd3d_free(loop); vkd3d_free(loop);
} }
@ -2741,7 +2746,7 @@ static void free_function_decl(struct hlsl_ir_function_decl *decl)
vkd3d_free((void *)decl->attrs); vkd3d_free((void *)decl->attrs);
vkd3d_free(decl->parameters.vars); vkd3d_free(decl->parameters.vars);
hlsl_free_instr_list(&decl->body.instrs); hlsl_block_cleanup(&decl->body);
vkd3d_free(decl); vkd3d_free(decl);
} }

1
libs/vkd3d-shader/hlsl.h
View File

@ -1014,6 +1014,7 @@ struct hlsl_ir_load *hlsl_add_conditional(struct hlsl_ctx *ctx, struct list *ins
void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl); void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl);
bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var); bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var);
void hlsl_block_cleanup(struct hlsl_block *block);
bool hlsl_clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, const struct hlsl_block *src_block); bool hlsl_clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, const struct hlsl_block *src_block);
void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func);