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

nir: Stop using designated initializers

Browse Source 
Designated initializers with anonymous unions don't work in MSVC or
GCC < 4.6.  With a couple of constructor methods, we don't need them any
more and the code is actually cleaner.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88467
Reviewed-by: Connor Abbot <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand
2015-01-21 11:11:03 -08:00
parent 76086d7120
commit f88c6a4997
10 changed files with 47 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/glsl/nir/nir_search.c
View File

@@ -221,13 +221,11 @@ construct_value(const nir_search_value *value, nir_alu_type type,
nir_instr_insert_before(instr, &alu->instr);
nir_alu_src val = {
.src.is_ssa = true,
.src.ssa = &alu->dest.dest.ssa,
.negate = false,
.abs = false,
.swizzle = { 0, 1, 2, 3 }
};
nir_alu_src val;
val.src = nir_src_for_ssa(&alu->dest.dest.ssa);
val.negate = false;
val.abs = false,
memcpy(val.swizzle, identity_swizzle, sizeof val.swizzle);
return val;
}
@@ -265,13 +263,11 @@ construct_value(const nir_search_value *value, nir_alu_type type,
nir_instr_insert_before(instr, &load->instr);
nir_alu_src val = {
.src.is_ssa = true,
.src.ssa = &load->def,
.negate = false,
.abs = false,
.swizzle = { 0, 0, 0, 0 } /* Splatted scalar */
};
nir_alu_src val;
val.src = nir_src_for_ssa(&load->def);
val.negate = false;
val.abs = false,
memset(val.swizzle, 0, sizeof val.swizzle);
return val;
}
@@ -314,12 +310,8 @@ nir_replace_instr(nir_alu_instr *instr, const nir_search_expression *search,
&instr->instr, mem_ctx);
nir_instr_insert_before(&instr->instr, &mov->instr);
nir_src replace_src = {
.is_ssa = true,
.ssa = &mov->dest.dest.ssa,
};
nir_ssa_def_rewrite_uses(&instr->dest.dest.ssa, replace_src, mem_ctx);
nir_ssa_def_rewrite_uses(&instr->dest.dest.ssa,
nir_src_for_ssa(&mov->dest.dest.ssa), mem_ctx);
/* We know this one has no more uses because we just rewrote them all,
* so we can remove it. The rest of the matched expression, however, we