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

nir: Fix helgrind complaints about data race in trivial_swizzle init.

Browse Source 
Even if the data race wasn't real (I'm not great at reasoning about
this), helgrind is a nice enough tool that keeping noise out of it is
probably worthwhile.  Besides, typing out the numbers keeps the data
in the read-only data section instead of emitting code to initialize
it every time.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Eric Anholt
2019-07-25 13:37:28 -07:00
parent 91986fbbdb
commit 3c46778b75
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/nir/nir_builder.h
View File

@@ -807,9 +807,9 @@ nir_ssa_for_src(nir_builder *build, nir_src src, int num_components)
static inline nir_ssa_def * static inline nir_ssa_def *
nir_ssa_for_alu_src(nir_builder *build, nir_alu_instr *instr, unsigned srcn) nir_ssa_for_alu_src(nir_builder *build, nir_alu_instr *instr, unsigned srcn)
{ {
static uint8_t trivial_swizzle[NIR_MAX_VEC_COMPONENTS]; static uint8_t trivial_swizzle[] = { 0, 1, 2, 3 };
for (int i = 0; i < NIR_MAX_VEC_COMPONENTS; ++i) STATIC_ASSERT(ARRAY_SIZE(trivial_swizzle) == NIR_MAX_VEC_COMPONENTS);
trivial_swizzle[i] = i;
nir_alu_src *src = &instr->src[srcn]; nir_alu_src *src = &instr->src[srcn];
unsigned num_components = nir_ssa_alu_instr_src_components(instr, srcn); unsigned num_components = nir_ssa_alu_instr_src_components(instr, srcn);