mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Fix regressions when introducing null-copy elision. 

Need to initialize the set mask so that copies happen properly
on default-initialized descriptors. Also, move the current_null_type to
metadata so that it's properly copied on descriptor copy.

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2021-09-03 12:09:36 +02:00
parent b4cb5a37f8
commit fa1d82e141
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/vkd3d/resource.c
View File

@ -3504,7 +3504,7 @@ static void d3d12_descriptor_heap_write_null_descriptor_template(struct d3d12_de
/* Skip writes with the same null type that are already null. */
if (!(desc->metadata.flags & VKD3D_DESCRIPTOR_FLAG_NON_NULL)
&& desc->current_null_type == vk_mutable_descriptor_type)
&& desc->metadata.current_null_type == vk_mutable_descriptor_type)
return;
num_writes = heap->null_descriptor_template.num_writes;
@ -3524,7 +3524,7 @@ static void d3d12_descriptor_heap_write_null_descriptor_template(struct d3d12_de
desc->metadata.cookie = 0;
desc->metadata.flags = 0;
desc->metadata.set_info_mask = heap->null_descriptor_template.set_info_mask;
desc->current_null_type = vk_mutable_descriptor_type;
desc->metadata.current_null_type = vk_mutable_descriptor_type;
memset(&desc->info, 0, sizeof(desc->info));
va = heap->raw_va_aux_buffer.host_ptr;
@ -5205,7 +5205,6 @@ static HRESULT d3d12_descriptor_heap_init_data_buffer(struct d3d12_descriptor_he
VkResult vr;
HRESULT hr;
if (desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV)
{
if (device->bindless_state.flags & VKD3D_RAW_VA_AUX_BUFFER)
@ -5472,6 +5471,9 @@ static void d3d12_descriptor_heap_init_descriptors(struct d3d12_descriptor_heap
{
desc[i].heap = descriptor_heap;
desc[i].heap_offset = i;
/* If we begin copying from the descriptors right away, we should copy the null descriptors
* which are already initialized. */
desc[i].metadata.set_info_mask = descriptor_heap->null_descriptor_template.set_info_mask;
}
break;

2
libs/vkd3d/vkd3d_private.h
View File

@ -990,6 +990,7 @@ struct vkd3d_descriptor_data
uint64_t cookie;
uint32_t set_info_mask;
uint32_t flags;
VkDescriptorType current_null_type;
};
#define D3D12_DESC_ALIGNMENT 64
@ -1004,7 +1005,6 @@ struct d3d12_desc
DECLSPEC_ALIGN(D3D12_DESC_ALIGNMENT) struct vkd3d_descriptor_data metadata;
struct d3d12_descriptor_heap *heap;
uint32_t heap_offset;
VkDescriptorType current_null_type;
union
{
VkDescriptorBufferInfo buffer;