Module: Mesa Branch: main Commit: 91ec3cc7e283bd9a57d1c326335cd78719907f5f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=91ec3cc7e283bd9a57d1c326335cd78719907f5f
Author: Yonggang Luo <luoyongg...@gmail.com> Date: Wed Jan 3 19:30:40 2024 +0800 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 <luoyongg...@gmail.com> Reviewed-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26885> --- src/panfrost/vulkan/panvk_device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c index 734b68044b2..ccf92a17fbe 100644 --- a/src/panfrost/vulkan/panvk_device.c +++ b/src/panfrost/vulkan/panvk_device.c @@ -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; }
