wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Update descriptor table ranges only with matching descriptor types.

Browse Source
This commit is contained in:
Józef Kucia
2017-09-11 22:35:16 +02:00
parent a78fe60ef8
commit 8e802ed0af
3 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/vkd3d/command.c
View File

@@ -1764,11 +1764,15 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li
}
static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write,
VkDescriptorImageInfo *vk_image_info, struct d3d12_desc *descriptor,
VkDescriptorSet vk_descriptor_set, uint32_t vk_binding, unsigned int index)
VkDescriptorImageInfo *vk_image_info, const struct d3d12_desc *descriptor,
uint32_t descriptor_range_magic, VkDescriptorSet vk_descriptor_set,
uint32_t vk_binding, unsigned int index)
{
const struct vkd3d_view *view = descriptor->u.view;
if (descriptor->magic != descriptor_range_magic)
return false;
vk_descriptor_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
vk_descriptor_write->pNext = NULL;
vk_descriptor_write->dstSet = vk_descriptor_set;
@@ -1819,10 +1823,6 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des
vk_descriptor_write->pImageInfo = vk_image_info;
break;
case VKD3D_DESCRIPTOR_MAGIC_FREE:
TRACE("Descriptor %u not initialized.\n", vk_descriptor_write->dstBinding);
return false;
default:
ERR("Invalid descriptor %#x.\n", descriptor->magic);
return false;
@@ -1881,7 +1881,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list
unsigned int register_idx = range->base_register_idx + j;
/* Track UAV counters. */
if (range->type == D3D12_DESCRIPTOR_RANGE_TYPE_UAV
if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV
&& register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views))
{
VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV
@@ -1892,7 +1892,8 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list
}
if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write,
current_image_info, descriptor, bindings->descriptor_set, range->binding, j))
current_image_info, descriptor, range->descriptor_magic,
bindings->descriptor_set, range->binding, j))
continue;
++descriptor_count;