wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Unroll descriptor copies for SRVs and UAVs.

Browse Source 
Consecutive binding updates need to have the same descriptor type
according to validation layers.
This commit is contained in:
Józef Kucia 2017-09-22 16:42:07 +02:00
parent 9d2730d98a
commit 14d975da8d
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libs/vkd3d/command.c
View File

@ -1714,7 +1714,8 @@ static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list,
const struct d3d12_root_descriptor_table_range *range; const struct d3d12_root_descriptor_table_range *range;
VkDevice vk_device = list->device->vk_device; VkDevice vk_device = list->device->vk_device;
VkCopyDescriptorSet *descriptor_copies; VkCopyDescriptorSet *descriptor_copies;
unsigned int i, j, count; unsigned int copy_descriptor_count;
unsigned int i, j, k, count;
unsigned int idx; unsigned int idx;
count = 0; count = 0;
@ -1728,7 +1729,20 @@ static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list,
continue; continue;
descriptor_table = &root_signature->parameters[i].u.descriptor_table; descriptor_table = &root_signature->parameters[i].u.descriptor_table;
count += descriptor_table->range_count; for (j = 0; j < descriptor_table->range_count; ++j)
{
range = &descriptor_table->ranges[j];
switch (range->descriptor_magic)
{
case VKD3D_DESCRIPTOR_MAGIC_SRV:
case VKD3D_DESCRIPTOR_MAGIC_UAV:
count += 2 * range->descriptor_count;
break;
default:
++count;
break;
}
}
} }
if (!count) if (!count)
@ -1765,21 +1779,28 @@ static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list,
for (j = 0; j < descriptor_table->range_count; ++j) for (j = 0; j < descriptor_table->range_count; ++j)
{ {
range = &descriptor_table->ranges[j]; range = &descriptor_table->ranges[j];
descriptor_copies[idx].sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET;
descriptor_copies[idx].pNext = NULL;
descriptor_copies[idx].srcSet = src_set;
descriptor_copies[idx].srcBinding = range->binding;
descriptor_copies[idx].srcArrayElement = 0;
descriptor_copies[idx].dstSet = bindings->descriptor_set;
descriptor_copies[idx].dstBinding = range->binding;
descriptor_copies[idx].dstArrayElement = 0;
descriptor_copies[idx].descriptorCount = 1;
if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV
|| range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) || range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV)
descriptor_copies[idx].descriptorCount = 2 * range->descriptor_count; copy_descriptor_count = 2 * range->descriptor_count;
else else
descriptor_copies[idx].descriptorCount = range->descriptor_count; copy_descriptor_count = 1;
++idx; for (k = 0; k < copy_descriptor_count; ++k)
{
descriptor_copies[idx].sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET;
descriptor_copies[idx].pNext = NULL;
descriptor_copies[idx].srcSet = src_set;
descriptor_copies[idx].srcBinding = range->binding + k;
descriptor_copies[idx].srcArrayElement = 0;
descriptor_copies[idx].dstSet = bindings->descriptor_set;
descriptor_copies[idx].dstBinding = range->binding + k;
descriptor_copies[idx].dstArrayElement = 0;
if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV
|| range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV)
descriptor_copies[idx].descriptorCount = 1;
else
descriptor_copies[idx].descriptorCount = range->descriptor_count;
++idx;
}
} }
} }
assert(count == idx); assert(count == idx);