Module: Mesa Branch: main Commit: 3a9c569177f6a7abbdbf473d54d50f64880a6ae7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a9c569177f6a7abbdbf473d54d50f64880a6ae7
Author: Yonggang Luo <luoyongg...@gmail.com> Date: Fri Nov 3 03:58:53 2023 +0800 intel: Avoid use align as variable, replace it with other names align is a function and when we want use it, the align variable will shadow it So replace it with other names Signed-off-by: Yonggang Luo <luoyongg...@gmail.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26864> --- src/intel/common/intel_aux_map.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/common/intel_aux_map.c b/src/intel/common/intel_aux_map.c index f66b664ed3b..3040d25d6dc 100644 --- a/src/intel/common/intel_aux_map.c +++ b/src/intel/common/intel_aux_map.c @@ -300,7 +300,7 @@ advance_current_pos(struct intel_aux_map_context *ctx, uint32_t size) static bool align_and_verify_space(struct intel_aux_map_context *ctx, uint32_t size, - uint32_t align) + uint32_t alignment) { if (ctx->tail_remaining < size) return false; @@ -308,7 +308,7 @@ align_and_verify_space(struct intel_aux_map_context *ctx, uint32_t size, struct aux_map_buffer *tail = list_last_entry(&ctx->buffers, struct aux_map_buffer, link); uint64_t gpu = tail->buffer->gpu + ctx->tail_offset; - uint64_t aligned = align64(gpu, align); + uint64_t aligned = align64(gpu, alignment); if ((aligned - gpu) + size > ctx->tail_remaining) { return false;
