Module: Mesa Branch: main Commit: 35a40b4c6a0b757f4dd407f52a441e2822736894 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=35a40b4c6a0b757f4dd407f52a441e2822736894
Author: Faith Ekstrand <[email protected]> Date: Sat Dec 9 16:01:44 2023 -0600 nvk: Add an NVK_MIN_TEXEL_BUFFER_ALIGNMENT #define Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26617> --- src/nouveau/vulkan/nvk_buffer.c | 2 +- src/nouveau/vulkan/nvk_physical_device.c | 4 ++-- src/nouveau/vulkan/nvk_private.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nouveau/vulkan/nvk_buffer.c b/src/nouveau/vulkan/nvk_buffer.c index df991e00949..f6913dacfa8 100644 --- a/src/nouveau/vulkan/nvk_buffer.c +++ b/src/nouveau/vulkan/nvk_buffer.c @@ -24,7 +24,7 @@ nvk_get_buffer_alignment(UNUSED const struct nv_device_info *info, if (usage_flags & (VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR | VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR)) - alignment = MAX2(alignment, NVK_MIN_UBO_ALIGNMENT); + alignment = MAX2(alignment, NVK_MIN_TEXEL_BUFFER_ALIGNMENT); if (create_flags & (VK_BUFFER_CREATE_SPARSE_BINDING_BIT | VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT)) diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 1f77ca6d725..db2f356c660 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -721,9 +721,9 @@ nvk_get_device_properties(const struct nvk_instance *instance, = info->cls_eng3d >= VOLTA_A, .integerDotProduct4x8BitPackedMixedSignednessAccelerated = info->cls_eng3d >= VOLTA_A, - .storageTexelBufferOffsetAlignmentBytes = 16, + .storageTexelBufferOffsetAlignmentBytes = NVK_MIN_TEXEL_BUFFER_ALIGNMENT, .storageTexelBufferOffsetSingleTexelAlignment = true, - .uniformTexelBufferOffsetAlignmentBytes = 16, + .uniformTexelBufferOffsetAlignmentBytes = NVK_MIN_TEXEL_BUFFER_ALIGNMENT, .uniformTexelBufferOffsetSingleTexelAlignment = true, .maxBufferSize = NVK_MAX_BUFFER_SIZE, diff --git a/src/nouveau/vulkan/nvk_private.h b/src/nouveau/vulkan/nvk_private.h index a10da4f935c..6ede6ae49f3 100644 --- a/src/nouveau/vulkan/nvk_private.h +++ b/src/nouveau/vulkan/nvk_private.h @@ -15,6 +15,7 @@ #define NVK_MAX_DYNAMIC_BUFFERS 64 #define NVK_MAX_RTS 8 #define NVK_MIN_SSBO_ALIGNMENT 64 +#define NVK_MIN_TEXEL_BUFFER_ALIGNMENT 16 #define NVK_MIN_UBO_ALIGNMENT 64 #define NVK_MAX_VIEWPORTS 16 #define NVK_MAX_DESCRIPTOR_SIZE 16
