wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Pass a struct d3d12_root_descriptor_table_range to vk_write_descriptor_set_from_d3d12_desc().

Browse Source 
Signed-off-by: Conor McCarthy <cmccarthy@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Conor McCarthy 2021-08-14 00:55:39 +10:00 committed by Alexandre Julliard
parent c7fc5ff819
commit 2021734a7b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/vkd3d/command.c
View File

@ -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, static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write,
VkDescriptorImageInfo *vk_image_info, const struct d3d12_desc *descriptor, VkDescriptorImageInfo *vk_image_info, const struct d3d12_desc *descriptor,
uint32_t descriptor_range_magic, VkDescriptorSet *vk_descriptor_sets, const struct d3d12_root_descriptor_table_range *range, VkDescriptorSet *vk_descriptor_sets,
uint32_t vk_binding, unsigned int index, bool use_array) unsigned int index, bool use_array)
{ {
uint32_t descriptor_range_magic = range->descriptor_magic;
const struct vkd3d_view *view = descriptor->u.view; const struct vkd3d_view *view = descriptor->u.view;
uint32_t vk_binding = range->binding;
if (descriptor->magic != descriptor_range_magic) if (descriptor->magic != descriptor_range_magic)
return false; 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, if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, current_image_info,
current_image_info, descriptor, range->descriptor_magic, descriptor, range, bindings->descriptor_sets, j, root_signature->use_descriptor_arrays))
bindings->descriptor_sets, range->binding, j, root_signature->use_descriptor_arrays))
continue; continue;
++descriptor_count; ++descriptor_count;