OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spirv: Pass vtn_block into vtn_emit_branch()

Browse Source 
This will be used later to handle branches instructions that have
parameters in them, e.g. SpvOpEmitMeshTasksEXT.  No behavior change in
this commit.

Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18442>
This commit is contained in:
Caio Oliveira
2022-09-19 13:35:13 -07:00
committed by Marge Bot
parent 3f4343c7cd
commit b9919b9980
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/spirv/vtn_cfg.c
View File

@@ -975,6 +975,7 @@ vtn_handle_phi_second_pass(struct vtn_builder *b, SpvOp opcode,
static void
vtn_emit_branch(struct vtn_builder *b, enum vtn_branch_type branch_type,
const struct vtn_block *block,
nir_variable *switch_fall_var, bool *has_switch_break)
{
switch (branch_type) {
@@ -1120,7 +1121,7 @@ vtn_emit_cf_list_structured(struct vtn_builder *b, struct list_head *cf_list,
vtn_emit_ret_store(b, block);
if (block->branch_type != vtn_branch_type_none) {
vtn_emit_branch(b, block->branch_type,
vtn_emit_branch(b, block->branch_type, block,
switch_fall_var, has_switch_break);
return;
}
@@ -1142,7 +1143,7 @@ vtn_emit_cf_list_structured(struct vtn_builder *b, struct list_head *cf_list,
vtn_emit_cf_list_structured(b, &vtn_if->then_body,
switch_fall_var, &sw_break, handler);
} else {
vtn_emit_branch(b, vtn_if->then_type, switch_fall_var, &sw_break);
vtn_emit_branch(b, vtn_if->then_type, NULL, switch_fall_var, &sw_break);
}
break;
}
@@ -1156,7 +1157,7 @@ vtn_emit_cf_list_structured(struct vtn_builder *b, struct list_head *cf_list,
vtn_emit_cf_list_structured(b, &vtn_if->then_body,
switch_fall_var, &sw_break, handler);
} else {
vtn_emit_branch(b, vtn_if->then_type, switch_fall_var, &sw_break);
vtn_emit_branch(b, vtn_if->then_type, NULL, switch_fall_var, &sw_break);
}
nir_push_else(&b->nb, nif);
@@ -1164,7 +1165,7 @@ vtn_emit_cf_list_structured(struct vtn_builder *b, struct list_head *cf_list,
vtn_emit_cf_list_structured(b, &vtn_if->else_body,
switch_fall_var, &sw_break, handler);
} else {
vtn_emit_branch(b, vtn_if->else_type, switch_fall_var, &sw_break);
vtn_emit_branch(b, vtn_if->else_type, NULL, switch_fall_var, &sw_break);
}
nir_pop_if(&b->nb, nif);