From 903fb6f74a77c704bb043bbdff64d8a4a9cee73e Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 12 Jun 2024 14:23:02 -0500 Subject: [PATCH] nvk: Make nvk_min_cbuf_alignment() inline Part-of: --- src/nouveau/vulkan/nvk_physical_device.c | 6 ------ src/nouveau/vulkan/nvk_physical_device.h | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 21da7f047ba..22cd45d8394 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -626,12 +626,6 @@ nvk_get_device_features(const struct nv_device_info *info, }; } -uint32_t -nvk_min_cbuf_alignment(const struct nv_device_info *info) -{ - return info->cls_eng3d >= TURING_A ? 64 : 256; -} - static void nvk_get_device_properties(const struct nvk_instance *instance, const struct nv_device_info *info, diff --git a/src/nouveau/vulkan/nvk_physical_device.h b/src/nouveau/vulkan/nvk_physical_device.h index a329f6f35b4..382b91b89a9 100644 --- a/src/nouveau/vulkan/nvk_physical_device.h +++ b/src/nouveau/vulkan/nvk_physical_device.h @@ -61,7 +61,11 @@ struct nvk_physical_device { const struct vk_sync_type *sync_types[2]; }; -uint32_t nvk_min_cbuf_alignment(const struct nv_device_info *info); +static inline uint32_t +nvk_min_cbuf_alignment(const struct nv_device_info *info) +{ + return info->cls_eng3d >= 0xC597 /* TURING_A */ ? 64 : 256; +} VK_DEFINE_HANDLE_CASTS(nvk_physical_device, vk.base,