Increase enum type in vn_descriptor_set.
authorDawn Han <dawnhan@google.com>
Mon, 11 Jul 2022 22:42:35 +0000 (22:42 +0000)
committerMarge Bot <emma+marge@anholt.net>
Fri, 2 Sep 2022 21:15:43 +0000 (21:15 +0000)
Signed-off-by: Dawn Han <dawnhan@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17505>

src/virtio/vulkan/vn_descriptor_set.c
src/virtio/vulkan/vn_descriptor_set.h

index ba208cf..a095934 100644 (file)
@@ -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;
index 0990f03..265306d 100644 (file)
@@ -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,