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

vkd3d: Remove cookie member from d3d12_resource. 

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2021-02-04 19:47:35 +01:00 committed by Hans-Kristian Arntzen
parent 6e81621b82
commit 56ff4622b6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/vkd3d/resource.c
View File

@ -2274,8 +2274,8 @@ static HRESULT d3d12_resource_create(struct d3d12_device *device, uint32_t flags
object->desc = *desc;
object->device = device;
object->flags = flags;
object->cookie = InterlockedIncrement64(&global_cookie_counter);
object->format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0);
object->res.cookie = vkd3d_allocate_cookie();
if (heap_properties)
object->heap_properties = *heap_properties;
@ -2481,7 +2481,6 @@ HRESULT d3d12_resource_create_reserved(struct d3d12_device *device,
if (d3d12_resource_is_buffer(object))
{
object->res.cookie = object->cookie;
object->res.size = object->desc.Width;
if (device->device_info.buffer_device_address_features.bufferDeviceAddress)
@ -3426,7 +3425,7 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor,
VKD3D_BINDLESS_SET_SRV | VKD3D_BINDLESS_SET_RAW_SSBO);
descriptor->info.buffer = descriptor_info[vk_write_count].buffer;
descriptor->metadata.cookie = resource ? resource->cookie : 0;
descriptor->metadata.cookie = resource ? resource->res.cookie : 0;
descriptor->metadata.set_info_mask |= 1u << info_index;
descriptor->metadata.flags |= VKD3D_DESCRIPTOR_FLAG_OFFSET_RANGE;
@ -3763,7 +3762,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_
VKD3D_BINDLESS_SET_UAV | VKD3D_BINDLESS_SET_RAW_SSBO);
descriptor->info.buffer = *buffer_info;
descriptor->metadata.cookie = resource ? resource->cookie : 0;
descriptor->metadata.cookie = resource ? resource->res.cookie : 0;
descriptor->metadata.set_info_mask |= 1u << info_index;
descriptor->metadata.flags |= VKD3D_DESCRIPTOR_FLAG_OFFSET_RANGE;

2
libs/vkd3d/vkd3d_private.h
View File

@ -680,8 +680,6 @@ struct d3d12_resource
LONG refcount;
LONG internal_refcount;
uint64_t cookie;
D3D12_RESOURCE_DESC desc;
D3D12_HEAP_PROPERTIES heap_properties;
struct vkd3d_memory_allocation mem;