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

nir: Drop "struct" from some nir_* declarations

Browse Source 
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:
Jason Ekstrand
2019-04-17 17:01:14 -05:00
parent db5b372bb9
commit eee994e769
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/nir/nir.h
View File

@@ -2756,13 +2756,13 @@ nir_src_instr(const struct nir_src *src)
#define NIR_SRC_AS_(name, c_type, type_enum, cast_macro) \ #define NIR_SRC_AS_(name, c_type, type_enum, cast_macro) \
static inline c_type * \ static inline c_type * \
nir_src_as_ ## name (struct nir_src *src) \ nir_src_as_ ## name (nir_src *src) \
{ \ { \
return src->is_ssa && src->ssa->parent_instr->type == type_enum \ return src->is_ssa && src->ssa->parent_instr->type == type_enum \
? cast_macro(src->ssa->parent_instr) : NULL; \ ? cast_macro(src->ssa->parent_instr) : NULL; \
} \ } \
static inline const c_type * \ static inline const c_type * \
nir_src_as_ ## name ## _const(const struct nir_src *src) \ nir_src_as_ ## name ## _const(const nir_src *src) \
{ \ { \
return src->is_ssa && src->ssa->parent_instr->type == type_enum \ return src->is_ssa && src->ssa->parent_instr->type == type_enum \
? cast_macro(src->ssa->parent_instr) : NULL; \ ? cast_macro(src->ssa->parent_instr) : NULL; \

8
src/compiler/nir/nir_instr_set.c
View File

@@ -281,10 +281,10 @@ nir_srcs_equal(nir_src src1, nir_src src2)
* that instruction is returned as a \c nir_alu_instr. Otherwise \c NULL is * that instruction is returned as a \c nir_alu_instr. Otherwise \c NULL is
* returned. * returned.
*/ */
static const struct nir_alu_instr * static const nir_alu_instr *
get_neg_instr(const nir_src *s) get_neg_instr(const nir_src *s)
{ {
const struct nir_alu_instr *const alu = nir_src_as_alu_instr_const(s); const nir_alu_instr *const alu = nir_src_as_alu_instr_const(s);
return alu != NULL && (alu->op == nir_op_fneg || alu->op == nir_op_ineg) return alu != NULL && (alu->op == nir_op_fneg || alu->op == nir_op_ineg)
? alu : NULL; ? alu : NULL;
@@ -440,7 +440,7 @@ nir_alu_srcs_negative_equal(const nir_alu_instr *alu1,
uint8_t alu1_swizzle[4] = {0}; uint8_t alu1_swizzle[4] = {0};
nir_src alu1_actual_src; nir_src alu1_actual_src;
const struct nir_alu_instr *const neg1 = get_neg_instr(&alu1->src[src1].src); const nir_alu_instr *const neg1 = get_neg_instr(&alu1->src[src1].src);
if (neg1) { if (neg1) {
parity = !parity; parity = !parity;
@@ -457,7 +457,7 @@ nir_alu_srcs_negative_equal(const nir_alu_instr *alu1,
uint8_t alu2_swizzle[4] = {0}; uint8_t alu2_swizzle[4] = {0};
nir_src alu2_actual_src; nir_src alu2_actual_src;
const struct nir_alu_instr *const neg2 = get_neg_instr(&alu2->src[src2].src); const nir_alu_instr *const neg2 = get_neg_instr(&alu2->src[src2].src);
if (neg2) { if (neg2) {
parity = !parity; parity = !parity;

10
src/compiler/nir/nir_opt_comparison_pre.c
View File

@@ -106,8 +106,8 @@ push_block(struct block_queue *bq)
} }
if (!u_vector_init(&bi->instructions, if (!u_vector_init(&bi->instructions,
sizeof(struct nir_alu_instr *), sizeof(nir_alu_instr *),
8 * sizeof(struct nir_alu_instr *))) 8 * sizeof(nir_alu_instr *)))
return NULL; return NULL;
exec_list_push_tail(&bq->blocks, &bi->node); exec_list_push_tail(&bq->blocks, &bi->node);
@@ -125,9 +125,9 @@ pop_block(struct block_queue *bq, struct block_instructions *bi)
static void static void
add_instruction_for_block(struct block_instructions *bi, add_instruction_for_block(struct block_instructions *bi,
struct nir_alu_instr *alu) nir_alu_instr *alu)
{ {
struct nir_alu_instr **data = nir_alu_instr **data =
u_vector_add(&bi->instructions); u_vector_add(&bi->instructions);
*data = alu; *data = alu;
@@ -227,7 +227,7 @@ comparison_pre_block(nir_block *block, struct block_queue *bq, nir_builder *bld)
if (instr->type != nir_instr_type_alu) if (instr->type != nir_instr_type_alu)
continue; continue;
struct nir_alu_instr *const alu = nir_instr_as_alu(instr); nir_alu_instr *const alu = nir_instr_as_alu(instr);
if (alu->dest.dest.ssa.num_components != 1) if (alu->dest.dest.ssa.num_components != 1)
continue; continue;