fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno: Do not use align as variable name, as it's a function in u_math.h and will be used

Browse source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38365>
This commit is contained in:
Yonggang Luo 2025-11-11 15:32:27 +08:00 • committed by Marge Bot
parent b241b26d11
commit 974f9833cb
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/freedreno/ir3/ir3_shared_ra.c
View file

@ -352,7 +352,7 @@ reg_file_size(struct ir3_register *reg)
static physreg_t
find_best_gap(struct ra_ctx *ctx, struct ir3_register *dst, unsigned size,
unsigned align)
unsigned alignment)
{
unsigned file_size = reg_file_size(dst);
@ -362,7 +362,7 @@ find_best_gap(struct ra_ctx *ctx, struct ir3_register *dst, unsigned size,
if (size > file_size)
return (physreg_t) ~0;
unsigned start = ALIGN(ctx->start, align);
unsigned start = ALIGN(ctx->start, alignment);
if (start + size > file_size)
start = 0;
unsigned candidate = start;
@ -380,7 +380,7 @@ find_best_gap(struct ra_ctx *ctx, struct ir3_register *dst, unsigned size,
return candidate;
}
candidate += align;
candidate += alignment;
if (candidate + size > file_size)
candidate = 0;
} while (candidate != start);
@ -390,12 +390,12 @@ find_best_gap(struct ra_ctx *ctx, struct ir3_register *dst, unsigned size,
static physreg_t
find_best_spill_reg(struct ra_ctx *ctx, struct ir3_register *reg,
unsigned size, unsigned align)
unsigned size, unsigned alignment)
{
unsigned file_size = reg_file_size(reg);
unsigned min_cost = UINT_MAX;
unsigned start = ALIGN(ctx->start, align);
unsigned start = ALIGN(ctx->start, alignment);
if (start + size > file_size)
start = 0;
physreg_t candidate = start;
@ -427,7 +427,7 @@ find_best_spill_reg(struct ra_ctx *ctx, struct ir3_register *reg,
best_reg = candidate;
}
candidate += align;
candidate += alignment;
if (candidate + size > file_size)
candidate = 0;
} while (candidate != start);