vk/0.170: Update VkDescriptorInfo

Ignore the new bufferInfo field with a anv_finishme.

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 89963aea55c160b5e33832955e38e67040736b33..dcba29cb42632bfe60d7d01a1dee341ac9e3a131 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1843,11 +1843,18 @@ typedef struct {
     const VkDescriptorTypeCount*                pTypeCount;
 } VkDescriptorPoolCreateInfo;
 
+typedef struct {
+    VkBuffer                                    buffer;
+    VkDeviceSize                                offset;
+    VkDeviceSize                                range;
+} VkDescriptorBufferInfo;
+
 typedef struct {
     VkBufferView                                bufferView;
     VkSampler                                   sampler;
     VkImageView                                 imageView;
     VkImageLayout                               imageLayout;
+    VkDescriptorBufferInfo                      bufferInfo;
 } VkDescriptorInfo;
 
 typedef struct {

diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c
index dd0aac483038f92605ab0edb01b64a610d308154..b12fabc2007fce9df91fb42d883a81c9aec77eb2 100644 (file)
--- a/src/vulkan/anv_device.c
+++ b/src/vulkan/anv_device.c
@@ -1701,6 +1701,16 @@ void anv_UpdateDescriptorSets(
       const VkWriteDescriptorSet *write = &pDescriptorWrites[i];
       ANV_FROM_HANDLE(anv_descriptor_set, set, write->destSet);
 
+      for (uint32_t j = 0; j < write->count; ++j) {
+         const VkDescriptorBufferInfo *binfo
+            = &write->pDescriptors[j].bufferInfo;
+
+         if (binfo->buffer.handle || binfo->offset || binfo->range) {
+            anv_finishme("VkWriteDesciptorSet::bufferInfo");
+            break;
+         }
+      }
+
       switch (write->descriptorType) {
       case VK_DESCRIPTOR_TYPE_SAMPLER:
       case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: