panfrost: 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 <luoyonggang@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26885>
This commit is contained in:
Yonggang Luo 2024-01-03 19:30:40 +08:00 committed by Marge Bot
parent b389bccccd
commit 91ec3cc7e2

View file

@ -1159,11 +1159,11 @@ panvk_GetBufferMemoryRequirements2(VkDevice device,
{
VK_FROM_HANDLE(panvk_buffer, buffer, pInfo->buffer);
const uint64_t align = 64;
const uint64_t size = align64(buffer->vk.size, align);
const uint64_t alignment = 64;
const uint64_t size = align64(buffer->vk.size, alignment);
pMemoryRequirements->memoryRequirements.memoryTypeBits = 1;
pMemoryRequirements->memoryRequirements.alignment = align;
pMemoryRequirements->memoryRequirements.alignment = alignment;
pMemoryRequirements->memoryRequirements.size = size;
}
@ -1174,11 +1174,11 @@ panvk_GetImageMemoryRequirements2(VkDevice device,
{
VK_FROM_HANDLE(panvk_image, image, pInfo->image);
const uint64_t align = 4096;
const uint64_t alignment = 4096;
const uint64_t size = panvk_image_get_total_size(image);
pMemoryRequirements->memoryRequirements.memoryTypeBits = 1;
pMemoryRequirements->memoryRequirements.alignment = align;
pMemoryRequirements->memoryRequirements.alignment = alignment;
pMemoryRequirements->memoryRequirements.size = size;
}