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

radeon: replace Elements() with ARRAY_SIZE()

Browse Source 
Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Brian Paul
2015-02-28 09:05:54 -07:00
parent 9775dbc335
commit 6633271159
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesa/drivers/dri/radeon/radeon_sanity.c
View File

@@ -331,7 +331,7 @@ struct reg {
}; };
static struct reg regs[Elements(reg_names)+1]; static struct reg regs[ARRAY_SIZE(reg_names)+1];
static struct reg scalars[512+1]; static struct reg scalars[512+1];
static struct reg vectors[512*4+1]; static struct reg vectors[512*4+1];
@@ -342,29 +342,29 @@ static void init_regs( void )
struct reg_names *tmp; struct reg_names *tmp;
int i; int i;
for (i = 0 ; i < Elements(regs)-1 ; i++) { for (i = 0 ; i < ARRAY_SIZE(regs)-1 ; i++) {
regs[i].idx = reg_names[i].idx; regs[i].idx = reg_names[i].idx;
regs[i].closest = &reg_names[i]; regs[i].closest = &reg_names[i];
regs[i].flags = 0; regs[i].flags = 0;
} }
for (i = 0, tmp = scalar_names ; i < Elements(scalars) ; i++) { for (i = 0, tmp = scalar_names ; i < ARRAY_SIZE(scalars) ; i++) {
if (tmp[1].idx == i) tmp++; if (tmp[1].idx == i) tmp++;
scalars[i].idx = i; scalars[i].idx = i;
scalars[i].closest = tmp; scalars[i].closest = tmp;
scalars[i].flags = ISFLOAT; scalars[i].flags = ISFLOAT;
} }
for (i = 0, tmp = vector_names ; i < Elements(vectors) ; i++) { for (i = 0, tmp = vector_names ; i < ARRAY_SIZE(vectors) ; i++) {
if (tmp[1].idx*4 == i) tmp++; if (tmp[1].idx*4 == i) tmp++;
vectors[i].idx = i; vectors[i].idx = i;
vectors[i].closest = tmp; vectors[i].closest = tmp;
vectors[i].flags = ISFLOAT|ISVEC; vectors[i].flags = ISFLOAT|ISVEC;
} }
regs[Elements(regs)-1].idx = -1; regs[ARRAY_SIZE(regs)-1].idx = -1;
scalars[Elements(scalars)-1].idx = -1; scalars[ARRAY_SIZE(scalars)-1].idx = -1;
vectors[Elements(vectors)-1].idx = -1; vectors[ARRAY_SIZE(vectors)-1].idx = -1;
} }
static int find_or_add_value( struct reg *reg, int val ) static int find_or_add_value( struct reg *reg, int val )
@@ -508,13 +508,13 @@ static void dump_state( void )
{ {
int i; int i;
for (i = 0 ; i < Elements(regs) ; i++) for (i = 0 ; i < ARRAY_SIZE(regs) ; i++)
print_reg( &regs[i] ); print_reg( &regs[i] );
for (i = 0 ; i < Elements(scalars) ; i++) for (i = 0 ; i < ARRAY_SIZE(scalars) ; i++)
print_reg( &scalars[i] ); print_reg( &scalars[i] );
for (i = 0 ; i < Elements(vectors) ; i++) for (i = 0 ; i < ARRAY_SIZE(vectors) ; i++)
print_reg( &vectors[i] ); print_reg( &vectors[i] );
} }