diff options
| author | Rob Clark <Rob Clark [email protected]> | 2013-04-22 13:55:14 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2013-04-24 21:09:46 -0400 |
| commit | eec37f1cdc1651588a4fcd5e87b57d85a57e431f (patch) | |
| tree | 7bddf5398cb89a8c7d508cefe6d036bb7b183445 /src/gallium/drivers/freedreno/ir-a2xx.c | |
| parent | 38d8b02eba9aea5b1ce61e8fc949163debda5cd7 (diff) | |
freedreno: use u_math macros/helpers more
Get rid of a few self-defined macros:
ALIGN() -> align()
min() -> MIN2()
max() -> MAX2()
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium/drivers/freedreno/ir-a2xx.c')
| -rw-r--r-- | src/gallium/drivers/freedreno/ir-a2xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/freedreno/ir-a2xx.c b/src/gallium/drivers/freedreno/ir-a2xx.c index 9d81e2e6f11..2448a782ddb 100644 --- a/src/gallium/drivers/freedreno/ir-a2xx.c +++ b/src/gallium/drivers/freedreno/ir-a2xx.c @@ -55,7 +55,7 @@ static uint32_t reg_alu_src_swiz(struct ir2_register *reg); static void * ir2_alloc(struct ir2_shader *shader, int sz) { void *ptr = &shader->heap[shader->heap_idx]; - shader->heap_idx += ALIGN(sz, 4); + shader->heap_idx += align(sz, 4); return ptr; } @@ -136,7 +136,7 @@ void * ir2_shader_assemble(struct ir2_shader *shader, struct ir2_shader_info *in info->regs_written = 0; /* we need an even # of CF's.. insert a NOP if needed */ - if (shader->cfs_count != ALIGN(shader->cfs_count, 2)) + if (shader->cfs_count != align(shader->cfs_count, 2)) ir2_cf_create(shader, NOP); /* first pass, resolve sizes and addresses: */ @@ -505,7 +505,7 @@ static void reg_update_stats(struct ir2_register *reg, struct ir2_shader_info *info, bool dest) { if (!(reg->flags & (IR2_REG_CONST|IR2_REG_EXPORT))) { - info->max_reg = max(info->max_reg, reg->num); + info->max_reg = MAX2(info->max_reg, reg->num); if (dest) { info->regs_written |= (1 << reg->num); @@ -514,7 +514,7 @@ static void reg_update_stats(struct ir2_register *reg, * input register that the thread scheduler (presumably?) * needs to know about: */ - info->max_input_reg = max(info->max_input_reg, reg->num); + info->max_input_reg = MAX2(info->max_input_reg, reg->num); } } } |