AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hk: dedupe hk_buffer_view_descriptor

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36127>
This commit is contained in:
Alyssa Rosenzweig
2025-07-12 19:08:27 -04:00
committed by Marge Bot
parent 24c708564f
commit 899f001936
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/asahi/vulkan/hk_descriptor_set.c
+1 -1
View File
@@ -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);
src/asahi/vulkan/hk_descriptor_set.h
-7
View File
@@ -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;
src/asahi/vulkan/hk_descriptor_set_layout.c
+1 -4
View File
@@ -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: