Module: Mesa Branch: main Commit: 8c847eb2def89bfed766fb1eaaf59434515cb032 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c847eb2def89bfed766fb1eaaf59434515cb032
Author: Yonggang Luo <[email protected]> Date: Thu Jun 29 11:34:46 2023 +0800 treewide: Use align64 instead of ALIGN for 64 bit value parameter Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23932> --- src/freedreno/drm-shim/freedreno_noop.c | 2 +- src/gallium/drivers/d3d12/d3d12_video_enc.cpp | 2 +- src/imagination/vulkan/pvr_device.c | 2 +- src/imagination/vulkan/pvr_image.c | 2 +- src/util/vma.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/freedreno/drm-shim/freedreno_noop.c b/src/freedreno/drm-shim/freedreno_noop.c index 63d8c601123..808bb1595d3 100644 --- a/src/freedreno/drm-shim/freedreno_noop.c +++ b/src/freedreno/drm-shim/freedreno_noop.c @@ -51,7 +51,7 @@ msm_ioctl_gem_new(int fd, unsigned long request, void *arg) { struct shim_fd *shim_fd = drm_shim_fd_lookup(fd); struct drm_msm_gem_new *create = arg; - size_t size = ALIGN(create->size, 4096); + size_t size = (size_t)align64(create->size, 4096); if (!size) return -EINVAL; diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp index dc6d3e9f91f..fa8fd9723a9 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp @@ -1950,7 +1950,7 @@ d3d12_video_encoder_encode_bitstream(struct pipe_video_codec * codec, (pD3D12Enc->m_currentEncodeCapabilities.m_ResourceRequirementsCaps.CompressedBitstreamBufferAccessAlignment > 1) && ((pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].preEncodeGeneratedHeadersByteSize % pD3D12Enc->m_currentEncodeCapabilities.m_ResourceRequirementsCaps.CompressedBitstreamBufferAccessAlignment) != 0) ) { - size_t new_size = ALIGN(pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].preEncodeGeneratedHeadersByteSize, pD3D12Enc->m_currentEncodeCapabilities.m_ResourceRequirementsCaps.CompressedBitstreamBufferAccessAlignment); + uint64_t new_size = align64(pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].preEncodeGeneratedHeadersByteSize, pD3D12Enc->m_currentEncodeCapabilities.m_ResourceRequirementsCaps.CompressedBitstreamBufferAccessAlignment); pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].preEncodeGeneratedHeadersBytePadding = new_size - pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].preEncodeGeneratedHeadersByteSize; pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].preEncodeGeneratedHeadersByteSize = new_size; pD3D12Enc->m_BitstreamHeadersBuffer.resize(pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].preEncodeGeneratedHeadersByteSize, 0); diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c index 34f1fa19378..f713c4096bd 100644 --- a/src/imagination/vulkan/pvr_device.c +++ b/src/imagination/vulkan/pvr_device.c @@ -3242,6 +3242,6 @@ void pvr_GetImageMemoryRequirements2(VkDevice _device, */ pMemoryRequirements->memoryRequirements.alignment = image->alignment; pMemoryRequirements->memoryRequirements.size = - ALIGN(image->size, image->alignment); + align64(image->size, image->alignment); pMemoryRequirements->memoryRequirements.memoryTypeBits = memory_types; } diff --git a/src/imagination/vulkan/pvr_image.c b/src/imagination/vulkan/pvr_image.c index c21544182da..7f8a39a2a43 100644 --- a/src/imagination/vulkan/pvr_image.c +++ b/src/imagination/vulkan/pvr_image.c @@ -136,7 +136,7 @@ static void pvr_image_setup_mip_levels(struct pvr_image *image) * requirement comes from. */ if (image->vk.array_layers > 1) - image->layer_size = ALIGN(image->layer_size, image->alignment); + image->layer_size = align64(image->layer_size, image->alignment); image->size = image->layer_size * image->vk.array_layers; } diff --git a/src/util/vma.c b/src/util/vma.c index ca96486a465..2afeb23fd81 100644 --- a/src/util/vma.c +++ b/src/util/vma.c @@ -167,7 +167,7 @@ util_vma_heap_alloc(struct util_vma_heap *heap, * alignment. */ if (heap->nospan_shift) { - assert(ALIGN(BITFIELD64_BIT(heap->nospan_shift), alignment) == + assert(align64(BITFIELD64_BIT(heap->nospan_shift), alignment) == BITFIELD64_BIT(heap->nospan_shift)); }
