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

vkd3d: Remove gpu_address 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:40:08 +01:00 committed by Hans-Kristian Arntzen
parent 833d7e207c
commit 6e81621b82
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/vkd3d/resource.c
View File

@ -1439,7 +1439,7 @@ static D3D12_GPU_VIRTUAL_ADDRESS STDMETHODCALLTYPE d3d12_resource_GetGPUVirtualA
TRACE("iface %p.\n", iface);
return resource->gpu_address;
return resource->res.va;
}
static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(d3d12_resource_iface *iface,
@ -2340,7 +2340,7 @@ HRESULT d3d12_resource_create_committed(struct d3d12_device *device, const D3D12
goto fail;
object->res.vk_buffer = object->mem.resource.vk_buffer;
object->gpu_address = object->mem.resource.va;
object->res.va = object->mem.resource.va;
object->heap_offset = object->mem.offset;
}
@ -2451,7 +2451,7 @@ HRESULT d3d12_resource_create_placed(struct d3d12_device *device, const D3D12_RE
else
{
object->res.vk_buffer = object->mem.resource.vk_buffer;
object->gpu_address = object->mem.resource.va;
object->res.va = object->mem.resource.va;
}
*resource = object;
@ -2495,7 +2495,6 @@ HRESULT d3d12_resource_create_reserved(struct d3d12_device *device,
return E_FAIL;
}
object->gpu_address = object->res.va;
vkd3d_va_map_insert(&device->memory_allocator.va_map, &object->res);
}

1
libs/vkd3d/vkd3d_private.h
View File

@ -684,7 +684,6 @@ struct d3d12_resource
D3D12_RESOURCE_DESC desc;
D3D12_HEAP_PROPERTIES heap_properties;
D3D12_GPU_VIRTUAL_ADDRESS gpu_address;
struct vkd3d_memory_allocation mem;
struct vkd3d_unique_resource res;