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

vkd3d: Do not store counter address in descriptor. 

Unnecessary because the UAV counter buffer is a host memory
allocation anyway in case of host-only descriptor heaps, so
we will not read from uncached memory.

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-12-10 14:28:17 +01:00 committed by Hans-Kristian Arntzen
parent 0cc374e0f8
commit 946bcd7922
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/vkd3d/resource.c
View File

@ -3503,9 +3503,9 @@ static void d3d12_desc_copy_single(struct d3d12_desc *dst, struct d3d12_desc *sr
{
if (dst->heap->uav_counters.host_ptr)
{
VkDeviceAddress *counter_addresses = dst->heap->uav_counters.host_ptr;
counter_addresses[dst->heap_offset] = src->counter_address;
dst->counter_address = src->counter_address;
const VkDeviceAddress *src_vas = src->heap->uav_counters.host_ptr;
VkDeviceAddress *dst_vas = dst->heap->uav_counters.host_ptr;
dst_vas[dst->heap_offset] = src_vas[src->heap_offset];
}
else
{
@ -3597,7 +3597,6 @@ void d3d12_desc_copy_range(struct d3d12_desc *dst, struct d3d12_desc *src,
{
dst[i].metadata = src[i].metadata;
dst[i].info = src[i].info;
dst[i].counter_address = src[i].counter_address;
}
if (copy_count)
@ -4630,7 +4629,6 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_
VkDeviceAddress *counter_addresses = descriptor->heap->uav_counters.host_ptr;
uint32_t descriptor_index = d3d12_desc_heap_offset(descriptor);
counter_addresses[descriptor_index] = uav_counter_address;
descriptor->counter_address = uav_counter_address;
}
else
{

1
libs/vkd3d/vkd3d_private.h
View File

@ -661,7 +661,6 @@ struct d3d12_desc
VkDescriptorBufferInfo buffer;
struct vkd3d_view *view;
} info;
VkDeviceAddress counter_address;
};
static inline struct d3d12_desc *d3d12_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle)