nvk: Use VkBufferUsageFlags2

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>

diff --git a/src/nouveau/vulkan/nvk_buffer.c b/src/nouveau/vulkan/nvk_buffer.c
index 4d3f22f..2040965 100644 (file)
--- a/src/nouveau/vulkan/nvk_buffer.c
+++ b/src/nouveau/vulkan/nvk_buffer.c
@@ -6,19 +6,19 @@
 
 uint32_t
 nvk_get_buffer_alignment(UNUSED const struct nvk_physical_device *pdev,
-                         VkBufferUsageFlags usage_flags,
+                         VkBufferUsageFlags2KHR usage_flags,
                          UNUSED VkBufferCreateFlags create_flags)
 {
    uint32_t alignment = 16;
 
-   if (usage_flags & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT)
+   if (usage_flags & VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT_KHR)
       alignment = MAX2(alignment, NVK_MIN_UBO_ALIGNMENT);
 
-   if (usage_flags & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT)
+   if (usage_flags & VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT_KHR)
       alignment = MAX2(alignment, NVK_MIN_SSBO_ALIGNMENT);
 
-   if (usage_flags & (VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT |
-                      VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT))
+   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);
 
    return alignment;

diff --git a/src/nouveau/vulkan/nvk_buffer.h b/src/nouveau/vulkan/nvk_buffer.h
index 0237572..07f8e96 100644 (file)
--- a/src/nouveau/vulkan/nvk_buffer.h
+++ b/src/nouveau/vulkan/nvk_buffer.h
@@ -12,7 +12,7 @@ struct nvk_physical_device;
 
 uint32_t ATTRIBUTE_PURE
 nvk_get_buffer_alignment(const struct nvk_physical_device *pdev,
-                         VkBufferUsageFlags usage_flags,
+                         VkBufferUsageFlags2KHR usage_flags,
                          VkBufferCreateFlags create_flags);
 
 struct nvk_buffer {

diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index d692ac4..4b13396 100644 (file)
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -119,13 +119,13 @@ nvk_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
          .nonCoherentAtomSize = 64,
          .minMemoryMapAlignment = 64,
          .minUniformBufferOffsetAlignment =
-            nvk_get_buffer_alignment(pdev, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, 0),
+            nvk_get_buffer_alignment(pdev, VK_BUFFER_USAGE_2_UNIFORM_BUFFER_BIT_KHR, 0),
          .minTexelBufferOffsetAlignment =
-            nvk_get_buffer_alignment(pdev, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT |
-                                           VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT,
+            nvk_get_buffer_alignment(pdev, VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR |
+                                           VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR,
                                      0),
          .minStorageBufferOffsetAlignment =
-            nvk_get_buffer_alignment(pdev, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, 0),
+            nvk_get_buffer_alignment(pdev, VK_BUFFER_USAGE_2_STORAGE_BUFFER_BIT_KHR, 0),
          .maxVertexInputAttributeOffset = 2047,
          .maxVertexInputAttributes = 32,
          .maxVertexInputBindingStride = 2048,