Module: Mesa Branch: main Commit: 70394675229f3fab1b0be224c2367198e26ea9ef URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=70394675229f3fab1b0be224c2367198e26ea9ef
Author: Dawn Han <[email protected]> Date: Mon Jul 11 22:42:35 2022 +0000 Increase enum type in vn_descriptor_set. Signed-off-by: Dawn Han <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17505> --- src/virtio/vulkan/vn_descriptor_set.c | 7 +++++++ src/virtio/vulkan/vn_descriptor_set.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/virtio/vulkan/vn_descriptor_set.c b/src/virtio/vulkan/vn_descriptor_set.c index ba208cfb267..a095934d6be 100644 --- a/src/virtio/vulkan/vn_descriptor_set.c +++ b/src/virtio/vulkan/vn_descriptor_set.c @@ -91,6 +91,8 @@ vn_descriptor_type_index(VkDescriptorType type) return VN_DESCRIPTOR_TYPE_INPUT_ATTACHMENT; case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: return VN_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; + case VK_DESCRIPTOR_TYPE_MUTABLE_VALVE: + return VN_DESCRIPTOR_TYPE_MUTABLE_VALVE; default: break; } @@ -288,6 +290,7 @@ vn_CreateDescriptorPool(VkDevice device, struct vn_descriptor_pool *pool = vk_zalloc(alloc, sizeof(*pool), VN_DEFAULT_ALIGN, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); + if (!pool) return vn_error(dev->instance, VK_ERROR_OUT_OF_HOST_MEMORY); @@ -823,6 +826,8 @@ vn_update_descriptor_sets_parse_template( case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: iub_count += 1; break; + case VK_DESCRIPTOR_TYPE_MUTABLE_VALVE: + break; default: unreachable("unhandled descriptor type"); break; @@ -1044,6 +1049,8 @@ vn_UpdateDescriptorSetWithTemplate( write->pNext, WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK); iub_data->pData = pData + entry->offset; break; + case VK_DESCRIPTOR_TYPE_MUTABLE_VALVE: + break; default: unreachable("unhandled descriptor type"); break; diff --git a/src/virtio/vulkan/vn_descriptor_set.h b/src/virtio/vulkan/vn_descriptor_set.h index 0990f038a55..265306dcf54 100644 --- a/src/virtio/vulkan/vn_descriptor_set.h +++ b/src/virtio/vulkan/vn_descriptor_set.h @@ -26,6 +26,7 @@ enum vn_descriptor_type { VN_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, VN_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, VN_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, + VN_DESCRIPTOR_TYPE_MUTABLE_VALVE, /* add new enum types before this line */ VN_NUM_DESCRIPTOR_TYPES,
