Module: vkd3d Branch: master Commit: 2021734a7b16078cdc64593408b3ac142bfbaf6f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2021734a7b16078cdc645934...
Author: Conor McCarthy cmccarthy@codeweavers.com Date: Sat Aug 14 00:55:39 2021 +1000
vkd3d: Pass a struct d3d12_root_descriptor_table_range to vk_write_descriptor_set_from_d3d12_desc().
Signed-off-by: Conor McCarthy cmccarthy@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
libs/vkd3d/command.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 879a105..964f5cd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2592,10 +2592,12 @@ 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, const struct d3d12_desc *descriptor, - uint32_t descriptor_range_magic, VkDescriptorSet *vk_descriptor_sets, - uint32_t vk_binding, unsigned int index, bool use_array) + const struct d3d12_root_descriptor_table_range *range, VkDescriptorSet *vk_descriptor_sets, + unsigned int index, bool use_array) { + uint32_t descriptor_range_magic = range->descriptor_magic; const struct vkd3d_view *view = descriptor->u.view; + uint32_t vk_binding = range->binding;
if (descriptor->magic != descriptor_range_magic) return false; @@ -2707,9 +2709,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, range->descriptor_magic, - bindings->descriptor_sets, range->binding, j, root_signature->use_descriptor_arrays)) + if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, current_image_info, + descriptor, range, bindings->descriptor_sets, j, root_signature->use_descriptor_arrays)) continue;
++descriptor_count;