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

nir/lower_goto_if: Add a block_for_singular_set helper

Browse Source 
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2401>
This commit is contained in:
Jason Ekstrand
2020-08-12 17:10:49 -05:00
committed by Marge Bot
parent 193765e26b
commit b892d473b4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/nir/nir_lower_goto_ifs.c
View File

@@ -105,6 +105,13 @@ sorted_block_arr_for_set(const struct set *block_set, void *mem_ctx)
return block_arr;
}
static nir_block *
block_for_singular_set(const struct set *block_set)
{
assert(block_set->entries == 1);
return (nir_block *)_mesa_set_next_entry(block_set, NULL)->key;
}
/**
* Sets all path variables to reach the target block via a fork
*/
@@ -734,9 +741,8 @@ select_blocks(struct routes *routing, nir_builder *b,
struct path in_path, void *mem_ctx)
{
if (!in_path.fork) {
nir_structurize(routing, b, (nir_block *)
_mesa_set_next_entry(in_path.reachable, NULL)->key,
mem_ctx);
nir_block *block = block_for_singular_set(in_path.reachable);
nir_structurize(routing, b, block, mem_ctx);
} else {
assert(!(in_path.fork->is_var &&
strcmp(in_path.fork->path_var->name, "path_select")));