fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk/0.170: Update VkDescriptorInfo

Browse source 
Ignore the new bufferInfo field with a anv_finishme.
This commit is contained in:
Chad Versace 2015-10-07 10:58:55 -07:00
parent 92e7bd3610
commit 8dee32e71f
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/vulkan/vulkan.h
View file

@ -1843,11 +1843,18 @@ typedef struct {
const VkDescriptorTypeCount* pTypeCount; const VkDescriptorTypeCount* pTypeCount;
} VkDescriptorPoolCreateInfo; } VkDescriptorPoolCreateInfo;
typedef struct {
VkBuffer buffer;
VkDeviceSize offset;
VkDeviceSize range;
} VkDescriptorBufferInfo;
typedef struct { typedef struct {
VkBufferView bufferView; VkBufferView bufferView;
VkSampler sampler; VkSampler sampler;
VkImageView imageView; VkImageView imageView;
VkImageLayout imageLayout; VkImageLayout imageLayout;
VkDescriptorBufferInfo bufferInfo;
} VkDescriptorInfo; } VkDescriptorInfo;
typedef struct { typedef struct {

10
src/vulkan/anv_device.c
View file

@ -1701,6 +1701,16 @@ void anv_UpdateDescriptorSets(
const VkWriteDescriptorSet *write = &pDescriptorWrites[i]; const VkWriteDescriptorSet *write = &pDescriptorWrites[i];
ANV_FROM_HANDLE(anv_descriptor_set, set, write->destSet); 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) { switch (write->descriptorType) {
case VK_DESCRIPTOR_TYPE_SAMPLER: case VK_DESCRIPTOR_TYPE_SAMPLER:
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: