fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-05 11:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

treewide: Use align64 instead of ALIGN for 64 bit value parameter

Browse source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23932>
This commit is contained in:
Yonggang Luo 2023-06-29 11:34:46 +08:00 • committed by Marge Bot
parent 32d2f70742
commit 8c847eb2de
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/freedreno/drm-shim/freedreno_noop.c
View file

@ -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;

2
src/gallium/drivers/d3d12/d3d12_video_enc.cpp
View file

@ -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);

2
src/imagination/vulkan/pvr_device.c
View file

@ -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;
}

2
src/imagination/vulkan/pvr_image.c
View file

@ -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;
}

2
src/util/vma.c
View file

@ -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));
}