From 899f001936f17239f60e8ef247ee6e1150062091 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 12 Jul 2025 19:08:27 -0400 Subject: [PATCH] hk: dedupe hk_buffer_view_descriptor Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/vulkan/hk_descriptor_set.c | 2 +- src/asahi/vulkan/hk_descriptor_set.h | 7 ------- src/asahi/vulkan/hk_descriptor_set_layout.c | 5 +---- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/asahi/vulkan/hk_descriptor_set.c b/src/asahi/vulkan/hk_descriptor_set.c index 42c9728d041..e2f30c451ea 100644 --- a/src/asahi/vulkan/hk_descriptor_set.c +++ b/src/asahi/vulkan/hk_descriptor_set.c @@ -204,7 +204,7 @@ write_buffer_view_desc(struct hk_descriptor_set *set, const VkBufferView bufferView, uint32_t binding, uint32_t elem) { - struct hk_buffer_view_descriptor desc = {}; + struct hk_storage_image_descriptor desc = {}; if (bufferView != VK_NULL_HANDLE) { VK_FROM_HANDLE(hk_buffer_view, view, bufferView); diff --git a/src/asahi/vulkan/hk_descriptor_set.h b/src/asahi/vulkan/hk_descriptor_set.h index 5360d6ebd30..0408a13d2f4 100644 --- a/src/asahi/vulkan/hk_descriptor_set.h +++ b/src/asahi/vulkan/hk_descriptor_set.h @@ -53,13 +53,6 @@ struct hk_storage_image_descriptor { static_assert(sizeof(struct hk_storage_image_descriptor) == 8, "hk_storage_image_descriptor has no holes"); -struct hk_buffer_view_descriptor { - uint32_t tex_offset; - uint32_t pbe_offset; -}; -static_assert(sizeof(struct hk_buffer_view_descriptor) == 8, - "hk_buffer_view_descriptor has no holes"); - /* This has to match nir_address_format_64bit_bounded_global */ struct hk_buffer_address { uint64_t base_addr; diff --git a/src/asahi/vulkan/hk_descriptor_set_layout.c b/src/asahi/vulkan/hk_descriptor_set_layout.c index dc7400bacf7..4cff2a3a756 100644 --- a/src/asahi/vulkan/hk_descriptor_set_layout.c +++ b/src/asahi/vulkan/hk_descriptor_set_layout.c @@ -43,12 +43,9 @@ hk_descriptor_stride_align_for_type( break; case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - *stride = *alignment = sizeof(struct hk_storage_image_descriptor); - break; - case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: - *stride = *alignment = sizeof(struct hk_buffer_view_descriptor); + *stride = *alignment = sizeof(struct hk_storage_image_descriptor); break; case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: