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

util/panfrost/glsl: rename BITSET_LAST_BIT to BITSET_LAST_BIT_SIZED

Browse Source 
The current users all pass in the number of dwords, but I'd like
to provide an interface that doess ARRAY_SIZE implicitly.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9456>
This commit is contained in:
Dave Airlie
2021-03-09 11:17:17 +10:00
parent d978383966
commit 0e1afe7c70
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/gl_nir_link_uniforms.c
View File

@@ -134,7 +134,7 @@ update_array_sizes(struct gl_shader_program *prog, nir_variable *var,
_mesa_hash_table_search(referenced_uniforms[stage], var->name); _mesa_hash_table_search(referenced_uniforms[stage], var->name);
if (entry) { if (entry) {
ainfo = (struct uniform_array_info *) entry->data; ainfo = (struct uniform_array_info *) entry->data;
max_array_size = MAX2(BITSET_LAST_BIT(ainfo->indices, words), max_array_size = MAX2(BITSET_LAST_BIT_SIZED(ainfo->indices, words),
max_array_size); max_array_size);
} }

2
src/panfrost/midgard/mir_promote_uniforms.c
View File

@@ -128,7 +128,7 @@ mir_dump_ubo_analysis(struct mir_ubo_analysis *res)
BITSET_WORD *uses = res->blocks[i].uses; BITSET_WORD *uses = res->blocks[i].uses;
BITSET_WORD *push = res->blocks[i].pushed; BITSET_WORD *push = res->blocks[i].pushed;
unsigned last = BITSET_LAST_BIT(uses, BITSET_WORDS(MAX_UBO_QWORDS)); unsigned last = BITSET_LAST_BIT_SIZED(uses, BITSET_WORDS(MAX_UBO_QWORDS));
printf("\t"); printf("\t");

2
src/util/bitset.h
View File

@@ -109,7 +109,7 @@ __bitset_last_bit(const BITSET_WORD *x, int n)
} }
#define BITSET_FFS(x) __bitset_ffs(x, ARRAY_SIZE(x)) #define BITSET_FFS(x) __bitset_ffs(x, ARRAY_SIZE(x))
#define BITSET_LAST_BIT(x, size) __bitset_last_bit(x, size) #define BITSET_LAST_BIT_SIZED(x, size) __bitset_last_bit(x, size)
static inline unsigned static inline unsigned
__bitset_next_set(unsigned i, BITSET_WORD *tmp, __bitset_next_set(unsigned i, BITSET_WORD *tmp,