wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Add ID3D12Device5 interface stub.

Browse Source
This commit is contained in:
Andrey Gusev 2023-09-28 21:06:10 +03:00 committed by Alexandre Julliard
parent f50d0ae2cb
commit 1006e8cbd4
Notes: Alexandre Julliard 2023-09-28 23:26:35 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/379
4 changed files with 192 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287
libs/vkd3d/device.c
View File

@ -2457,17 +2457,18 @@ static void vkd3d_desc_object_cache_cleanup(struct vkd3d_desc_object_cache *cach
} }
/* ID3D12Device */ /* ID3D12Device */
static inline struct d3d12_device *impl_from_ID3D12Device4(ID3D12Device4 *iface) static inline struct d3d12_device *impl_from_ID3D12Device5(ID3D12Device5 *iface)
{ {
return CONTAINING_RECORD(iface, struct d3d12_device, ID3D12Device4_iface); return CONTAINING_RECORD(iface, struct d3d12_device, ID3D12Device5_iface);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_QueryInterface(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_QueryInterface(ID3D12Device5 *iface,
REFIID riid, void **object) REFIID riid, void **object)
{ {
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
if (IsEqualGUID(riid, &IID_ID3D12Device4) if (IsEqualGUID(riid, &IID_ID3D12Device5)
|| IsEqualGUID(riid, &IID_ID3D12Device4)
|| IsEqualGUID(riid, &IID_ID3D12Device3) || IsEqualGUID(riid, &IID_ID3D12Device3)
|| IsEqualGUID(riid, &IID_ID3D12Device2) || IsEqualGUID(riid, &IID_ID3D12Device2)
|| IsEqualGUID(riid, &IID_ID3D12Device1) || IsEqualGUID(riid, &IID_ID3D12Device1)
@ -2486,9 +2487,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_QueryInterface(ID3D12Device4 *ifac
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG STDMETHODCALLTYPE d3d12_device_AddRef(ID3D12Device4 *iface) static ULONG STDMETHODCALLTYPE d3d12_device_AddRef(ID3D12Device5 *iface)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
ULONG refcount = InterlockedIncrement(&device->refcount); ULONG refcount = InterlockedIncrement(&device->refcount);
TRACE("%p increasing refcount to %u.\n", device, refcount); TRACE("%p increasing refcount to %u.\n", device, refcount);
@ -2496,9 +2497,9 @@ static ULONG STDMETHODCALLTYPE d3d12_device_AddRef(ID3D12Device4 *iface)
return refcount; return refcount;
} }
static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device4 *iface) static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device5 *iface)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
ULONG refcount = InterlockedDecrement(&device->refcount); ULONG refcount = InterlockedDecrement(&device->refcount);
TRACE("%p decreasing refcount to %u.\n", device, refcount); TRACE("%p decreasing refcount to %u.\n", device, refcount);
@ -2532,10 +2533,10 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device4 *iface)
return refcount; return refcount;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_GetPrivateData(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_GetPrivateData(ID3D12Device5 *iface,
REFGUID guid, UINT *data_size, void *data) REFGUID guid, UINT *data_size, void *data)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", TRACE("iface %p, guid %s, data_size %p, data %p.\n",
iface, debugstr_guid(guid), data_size, data); iface, debugstr_guid(guid), data_size, data);
@ -2543,10 +2544,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_GetPrivateData(ID3D12Device4 *ifac
return vkd3d_get_private_data(&device->private_store, guid, data_size, data); return vkd3d_get_private_data(&device->private_store, guid, data_size, data);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateData(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateData(ID3D12Device5 *iface,
REFGUID guid, UINT data_size, const void *data) REFGUID guid, UINT data_size, const void *data)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n", TRACE("iface %p, guid %s, data_size %u, data %p.\n",
iface, debugstr_guid(guid), data_size, data); iface, debugstr_guid(guid), data_size, data);
@ -2554,19 +2555,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateData(ID3D12Device4 *ifac
return vkd3d_set_private_data(&device->private_store, guid, data_size, data); return vkd3d_set_private_data(&device->private_store, guid, data_size, data);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateDataInterface(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_SetPrivateDataInterface(ID3D12Device5 *iface,
REFGUID guid, const IUnknown *data) REFGUID guid, const IUnknown *data)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
return vkd3d_set_private_data_interface(&device->private_store, guid, data); return vkd3d_set_private_data_interface(&device->private_store, guid, data);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_SetName(ID3D12Device4 *iface, const WCHAR *name) static HRESULT STDMETHODCALLTYPE d3d12_device_SetName(ID3D12Device5 *iface, const WCHAR *name)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
TRACE("iface %p, name %s.\n", iface, debugstr_w(name, device->wchar_size)); TRACE("iface %p, name %s.\n", iface, debugstr_w(name, device->wchar_size));
@ -2574,17 +2575,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_SetName(ID3D12Device4 *iface, cons
VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, name); VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, name);
} }
static UINT STDMETHODCALLTYPE d3d12_device_GetNodeCount(ID3D12Device4 *iface) static UINT STDMETHODCALLTYPE d3d12_device_GetNodeCount(ID3D12Device5 *iface)
{ {
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
return 1; return 1;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandQueue(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandQueue(ID3D12Device5 *iface,
const D3D12_COMMAND_QUEUE_DESC *desc, REFIID riid, void **command_queue) const D3D12_COMMAND_QUEUE_DESC *desc, REFIID riid, void **command_queue)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_command_queue *object; struct d3d12_command_queue *object;
HRESULT hr; HRESULT hr;
@ -2598,10 +2599,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandQueue(ID3D12Device4 *
riid, command_queue); riid, command_queue);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandAllocator(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandAllocator(ID3D12Device5 *iface,
D3D12_COMMAND_LIST_TYPE type, REFIID riid, void **command_allocator) D3D12_COMMAND_LIST_TYPE type, REFIID riid, void **command_allocator)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_command_allocator *object; struct d3d12_command_allocator *object;
HRESULT hr; HRESULT hr;
@ -2615,10 +2616,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandAllocator(ID3D12Devic
riid, command_allocator); riid, command_allocator);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateGraphicsPipelineState(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateGraphicsPipelineState(ID3D12Device5 *iface,
const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, REFIID riid, void **pipeline_state) const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, REFIID riid, void **pipeline_state)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_pipeline_state *object; struct d3d12_pipeline_state *object;
HRESULT hr; HRESULT hr;
@ -2632,10 +2633,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateGraphicsPipelineState(ID3D12
&IID_ID3D12PipelineState, riid, pipeline_state); &IID_ID3D12PipelineState, riid, pipeline_state);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateComputePipelineState(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateComputePipelineState(ID3D12Device5 *iface,
const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, REFIID riid, void **pipeline_state) const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, REFIID riid, void **pipeline_state)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_pipeline_state *object; struct d3d12_pipeline_state *object;
HRESULT hr; HRESULT hr;
@ -2649,11 +2650,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateComputePipelineState(ID3D12D
&IID_ID3D12PipelineState, riid, pipeline_state); &IID_ID3D12PipelineState, riid, pipeline_state);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device5 *iface,
UINT node_mask, D3D12_COMMAND_LIST_TYPE type, ID3D12CommandAllocator *command_allocator, UINT node_mask, D3D12_COMMAND_LIST_TYPE type, ID3D12CommandAllocator *command_allocator,
ID3D12PipelineState *initial_pipeline_state, REFIID riid, void **command_list) ID3D12PipelineState *initial_pipeline_state, REFIID riid, void **command_list)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_command_list *object; struct d3d12_command_list *object;
HRESULT hr; HRESULT hr;
@ -2776,10 +2777,10 @@ bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent)
return true; return true;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device5 *iface,
D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) D3D12_FEATURE feature, void *feature_data, UINT feature_data_size)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n", TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n",
iface, feature, feature_data, feature_data_size); iface, feature, feature_data, feature_data_size);
@ -3278,10 +3279,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device4
} }
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateDescriptorHeap(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateDescriptorHeap(ID3D12Device5 *iface,
const D3D12_DESCRIPTOR_HEAP_DESC *desc, REFIID riid, void **descriptor_heap) const D3D12_DESCRIPTOR_HEAP_DESC *desc, REFIID riid, void **descriptor_heap)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_descriptor_heap *object; struct d3d12_descriptor_heap *object;
HRESULT hr; HRESULT hr;
@ -3295,7 +3296,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateDescriptorHeap(ID3D12Device4
&IID_ID3D12DescriptorHeap, riid, descriptor_heap); &IID_ID3D12DescriptorHeap, riid, descriptor_heap);
} }
static UINT STDMETHODCALLTYPE d3d12_device_GetDescriptorHandleIncrementSize(ID3D12Device4 *iface, static UINT STDMETHODCALLTYPE d3d12_device_GetDescriptorHandleIncrementSize(ID3D12Device5 *iface,
D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type) D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type)
{ {
TRACE("iface %p, descriptor_heap_type %#x.\n", iface, descriptor_heap_type); TRACE("iface %p, descriptor_heap_type %#x.\n", iface, descriptor_heap_type);
@ -3318,11 +3319,11 @@ static UINT STDMETHODCALLTYPE d3d12_device_GetDescriptorHandleIncrementSize(ID3D
} }
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device5 *iface,
UINT node_mask, const void *bytecode, SIZE_T bytecode_length, UINT node_mask, const void *bytecode, SIZE_T bytecode_length,
REFIID riid, void **root_signature) REFIID riid, void **root_signature)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_root_signature *object; struct d3d12_root_signature *object;
HRESULT hr; HRESULT hr;
@ -3338,10 +3339,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device4
&IID_ID3D12RootSignature, riid, root_signature); &IID_ID3D12RootSignature, riid, root_signature);
} }
static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device5 *iface,
const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor) const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_desc tmp = {0}; struct d3d12_desc tmp = {0};
TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr);
@ -3350,11 +3351,11 @@ static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device
d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device);
} }
static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device5 *iface,
ID3D12Resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc, ID3D12Resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc,
D3D12_CPU_DESCRIPTOR_HANDLE descriptor) D3D12_CPU_DESCRIPTOR_HANDLE descriptor)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_desc tmp = {0}; struct d3d12_desc tmp = {0};
TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n",
@ -3364,11 +3365,11 @@ static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device
d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device);
} }
static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Device5 *iface,
ID3D12Resource *resource, ID3D12Resource *counter_resource, ID3D12Resource *resource, ID3D12Resource *counter_resource,
const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor) const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_desc tmp = {0}; struct d3d12_desc tmp = {0};
TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %#lx.\n", TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %#lx.\n",
@ -3379,7 +3380,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Devic
d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device);
} }
static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device5 *iface,
ID3D12Resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc, ID3D12Resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc,
D3D12_CPU_DESCRIPTOR_HANDLE descriptor) D3D12_CPU_DESCRIPTOR_HANDLE descriptor)
{ {
@ -3387,10 +3388,10 @@ static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device4
iface, resource, desc, descriptor.ptr); iface, resource, desc, descriptor.ptr);
d3d12_rtv_desc_create_rtv(d3d12_rtv_desc_from_cpu_handle(descriptor), d3d12_rtv_desc_create_rtv(d3d12_rtv_desc_from_cpu_handle(descriptor),
impl_from_ID3D12Device4(iface), unsafe_impl_from_ID3D12Resource(resource), desc); impl_from_ID3D12Device5(iface), unsafe_impl_from_ID3D12Resource(resource), desc);
} }
static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device5 *iface,
ID3D12Resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc, ID3D12Resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc,
D3D12_CPU_DESCRIPTOR_HANDLE descriptor) D3D12_CPU_DESCRIPTOR_HANDLE descriptor)
{ {
@ -3398,13 +3399,13 @@ static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device4
iface, resource, desc, descriptor.ptr); iface, resource, desc, descriptor.ptr);
d3d12_dsv_desc_create_dsv(d3d12_dsv_desc_from_cpu_handle(descriptor), d3d12_dsv_desc_create_dsv(d3d12_dsv_desc_from_cpu_handle(descriptor),
impl_from_ID3D12Device4(iface), unsafe_impl_from_ID3D12Resource(resource), desc); impl_from_ID3D12Device5(iface), unsafe_impl_from_ID3D12Resource(resource), desc);
} }
static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device5 *iface,
const D3D12_SAMPLER_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor) const D3D12_SAMPLER_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_desc tmp = {0}; struct d3d12_desc tmp = {0};
TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr);
@ -3413,14 +3414,14 @@ static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device4 *iface,
d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device);
} }
static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device5 *iface,
UINT dst_descriptor_range_count, const D3D12_CPU_DESCRIPTOR_HANDLE *dst_descriptor_range_offsets, UINT dst_descriptor_range_count, const D3D12_CPU_DESCRIPTOR_HANDLE *dst_descriptor_range_offsets,
const UINT *dst_descriptor_range_sizes, const UINT *dst_descriptor_range_sizes,
UINT src_descriptor_range_count, const D3D12_CPU_DESCRIPTOR_HANDLE *src_descriptor_range_offsets, UINT src_descriptor_range_count, const D3D12_CPU_DESCRIPTOR_HANDLE *src_descriptor_range_offsets,
const UINT *src_descriptor_range_sizes, const UINT *src_descriptor_range_sizes,
D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type) D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
unsigned int dst_range_idx, dst_idx, src_range_idx, src_idx; unsigned int dst_range_idx, dst_idx, src_range_idx, src_idx;
unsigned int dst_range_size, src_range_size; unsigned int dst_range_size, src_range_size;
struct d3d12_descriptor_heap *dst_heap; struct d3d12_descriptor_heap *dst_heap;
@ -3476,7 +3477,7 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device4 *iface,
} }
} }
static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device5 *iface,
UINT descriptor_count, const D3D12_CPU_DESCRIPTOR_HANDLE dst_descriptor_range_offset, UINT descriptor_count, const D3D12_CPU_DESCRIPTOR_HANDLE dst_descriptor_range_offset,
const D3D12_CPU_DESCRIPTOR_HANDLE src_descriptor_range_offset, const D3D12_CPU_DESCRIPTOR_HANDLE src_descriptor_range_offset,
D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type) D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type)
@ -3491,10 +3492,10 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device4 *
} }
static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResourceAllocationInfo( static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResourceAllocationInfo(
ID3D12Device4 *iface, D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask, ID3D12Device5 *iface, D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask,
UINT count, const D3D12_RESOURCE_DESC *resource_descs) UINT count, const D3D12_RESOURCE_DESC *resource_descs)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
const D3D12_RESOURCE_DESC *desc; const D3D12_RESOURCE_DESC *desc;
uint64_t requested_alignment; uint64_t requested_alignment;
@ -3567,10 +3568,10 @@ invalid:
return info; return info;
} }
static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapProperties(ID3D12Device4 *iface, static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapProperties(ID3D12Device5 *iface,
D3D12_HEAP_PROPERTIES *heap_properties, UINT node_mask, D3D12_HEAP_TYPE heap_type) D3D12_HEAP_PROPERTIES *heap_properties, UINT node_mask, D3D12_HEAP_TYPE heap_type)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
bool coherent; bool coherent;
TRACE("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x.\n", TRACE("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x.\n",
@ -3610,12 +3611,12 @@ static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapPrope
return heap_properties; return heap_properties;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Device5 *iface,
const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_resource *object; struct d3d12_resource *object;
HRESULT hr; HRESULT hr;
@ -3634,10 +3635,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Devi
return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device5 *iface,
const D3D12_HEAP_DESC *desc, REFIID iid, void **heap) const D3D12_HEAP_DESC *desc, REFIID iid, void **heap)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_heap *object; struct d3d12_heap *object;
HRESULT hr; HRESULT hr;
@ -3653,12 +3654,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device4 *iface,
return return_interface(&object->ID3D12Heap_iface, &IID_ID3D12Heap, iid, heap); return return_interface(&object->ID3D12Heap_iface, &IID_ID3D12Heap, iid, heap);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device5 *iface,
ID3D12Heap *heap, UINT64 heap_offset, ID3D12Heap *heap, UINT64 heap_offset,
const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_heap *heap_object; struct d3d12_heap *heap_object;
struct d3d12_resource *object; struct d3d12_resource *object;
HRESULT hr; HRESULT hr;
@ -3677,11 +3678,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device4
return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource(ID3D12Device5 *iface,
const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_resource *object; struct d3d12_resource *object;
HRESULT hr; HRESULT hr;
@ -3695,11 +3696,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource(ID3D12Devic
return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateSharedHandle(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateSharedHandle(ID3D12Device5 *iface,
ID3D12DeviceChild *object, const SECURITY_ATTRIBUTES *attributes, DWORD access, ID3D12DeviceChild *object, const SECURITY_ATTRIBUTES *attributes, DWORD access,
const WCHAR *name, HANDLE *handle) const WCHAR *name, HANDLE *handle)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
FIXME("iface %p, object %p, attributes %p, access %#x, name %s, handle %p stub!\n", FIXME("iface %p, object %p, attributes %p, access %#x, name %s, handle %p stub!\n",
iface, object, attributes, access, debugstr_w(name, device->wchar_size), handle); iface, object, attributes, access, debugstr_w(name, device->wchar_size), handle);
@ -3707,7 +3708,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateSharedHandle(ID3D12Device4 *
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandle(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandle(ID3D12Device5 *iface,
HANDLE handle, REFIID riid, void **object) HANDLE handle, REFIID riid, void **object)
{ {
FIXME("iface %p, handle %p, riid %s, object %p stub!\n", FIXME("iface %p, handle %p, riid %s, object %p stub!\n",
@ -3716,10 +3717,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandle(ID3D12Device4 *if
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Device5 *iface,
const WCHAR *name, DWORD access, HANDLE *handle) const WCHAR *name, DWORD access, HANDLE *handle)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
FIXME("iface %p, name %s, access %#x, handle %p stub!\n", FIXME("iface %p, name %s, access %#x, handle %p stub!\n",
iface, debugstr_w(name, device->wchar_size), access, handle); iface, debugstr_w(name, device->wchar_size), access, handle);
@ -3727,7 +3728,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Devic
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device5 *iface,
UINT object_count, ID3D12Pageable * const *objects) UINT object_count, ID3D12Pageable * const *objects)
{ {
FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n", FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n",
@ -3736,7 +3737,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device4 *iface,
return S_OK; return S_OK;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device5 *iface,
UINT object_count, ID3D12Pageable * const *objects) UINT object_count, ID3D12Pageable * const *objects)
{ {
FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n", FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n",
@ -3745,10 +3746,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device4 *iface,
return S_OK; return S_OK;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device5 *iface,
UINT64 initial_value, D3D12_FENCE_FLAGS flags, REFIID riid, void **fence) UINT64 initial_value, D3D12_FENCE_FLAGS flags, REFIID riid, void **fence)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_fence *object; struct d3d12_fence *object;
HRESULT hr; HRESULT hr;
@ -3761,21 +3762,21 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device4 *iface,
return return_interface(&object->ID3D12Fence1_iface, &IID_ID3D12Fence1, riid, fence); return return_interface(&object->ID3D12Fence1_iface, &IID_ID3D12Fence1, riid, fence);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_GetDeviceRemovedReason(ID3D12Device4 *iface) static HRESULT STDMETHODCALLTYPE d3d12_device_GetDeviceRemovedReason(ID3D12Device5 *iface)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
return device->removed_reason; return device->removed_reason;
} }
static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device5 *iface,
const D3D12_RESOURCE_DESC *desc, UINT first_sub_resource, UINT sub_resource_count, const D3D12_RESOURCE_DESC *desc, UINT first_sub_resource, UINT sub_resource_count,
UINT64 base_offset, D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, UINT64 base_offset, D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts,
UINT *row_counts, UINT64 *row_sizes, UINT64 *total_bytes) UINT *row_counts, UINT64 *row_sizes, UINT64 *total_bytes)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch;
unsigned int width, height, depth, plane_count, sub_resources_per_plane; unsigned int width, height, depth, plane_count, sub_resources_per_plane;
@ -3855,10 +3856,10 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device4 *
*total_bytes = total; *total_bytes = total;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateQueryHeap(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateQueryHeap(ID3D12Device5 *iface,
const D3D12_QUERY_HEAP_DESC *desc, REFIID iid, void **heap) const D3D12_QUERY_HEAP_DESC *desc, REFIID iid, void **heap)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_query_heap *object; struct d3d12_query_heap *object;
HRESULT hr; HRESULT hr;
@ -3871,18 +3872,18 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateQueryHeap(ID3D12Device4 *ifa
return return_interface(&object->ID3D12QueryHeap_iface, &IID_ID3D12QueryHeap, iid, heap); return return_interface(&object->ID3D12QueryHeap_iface, &IID_ID3D12QueryHeap, iid, heap);
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_SetStablePowerState(ID3D12Device4 *iface, BOOL enable) static HRESULT STDMETHODCALLTYPE d3d12_device_SetStablePowerState(ID3D12Device5 *iface, BOOL enable)
{ {
FIXME("iface %p, enable %#x stub!\n", iface, enable); FIXME("iface %p, enable %#x stub!\n", iface, enable);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandSignature(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandSignature(ID3D12Device5 *iface,
const D3D12_COMMAND_SIGNATURE_DESC *desc, ID3D12RootSignature *root_signature, const D3D12_COMMAND_SIGNATURE_DESC *desc, ID3D12RootSignature *root_signature,
REFIID iid, void **command_signature) REFIID iid, void **command_signature)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
struct d3d12_command_signature *object; struct d3d12_command_signature *object;
HRESULT hr; HRESULT hr;
@ -3896,14 +3897,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandSignature(ID3D12Devic
&IID_ID3D12CommandSignature, iid, command_signature); &IID_ID3D12CommandSignature, iid, command_signature);
} }
static void STDMETHODCALLTYPE d3d12_device_GetResourceTiling(ID3D12Device4 *iface, static void STDMETHODCALLTYPE d3d12_device_GetResourceTiling(ID3D12Device5 *iface,
ID3D12Resource *resource, UINT *total_tile_count, ID3D12Resource *resource, UINT *total_tile_count,
D3D12_PACKED_MIP_INFO *packed_mip_info, D3D12_TILE_SHAPE *standard_tile_shape, D3D12_PACKED_MIP_INFO *packed_mip_info, D3D12_TILE_SHAPE *standard_tile_shape,
UINT *sub_resource_tiling_count, UINT first_sub_resource_tiling, UINT *sub_resource_tiling_count, UINT first_sub_resource_tiling,
D3D12_SUBRESOURCE_TILING *sub_resource_tilings) D3D12_SUBRESOURCE_TILING *sub_resource_tilings)
{ {
const struct d3d12_resource *resource_impl = impl_from_ID3D12Resource(resource); const struct d3d12_resource *resource_impl = impl_from_ID3D12Resource(resource);
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
TRACE("iface %p, resource %p, total_tile_count %p, packed_mip_info %p, " TRACE("iface %p, resource %p, total_tile_count %p, packed_mip_info %p, "
"standard_title_shape %p, sub_resource_tiling_count %p, " "standard_title_shape %p, sub_resource_tiling_count %p, "
@ -3916,9 +3917,9 @@ static void STDMETHODCALLTYPE d3d12_device_GetResourceTiling(ID3D12Device4 *ifac
sub_resource_tiling_count, first_sub_resource_tiling, sub_resource_tilings); sub_resource_tiling_count, first_sub_resource_tiling, sub_resource_tilings);
} }
static LUID * STDMETHODCALLTYPE d3d12_device_GetAdapterLuid(ID3D12Device4 *iface, LUID *luid) static LUID * STDMETHODCALLTYPE d3d12_device_GetAdapterLuid(ID3D12Device5 *iface, LUID *luid)
{ {
struct d3d12_device *device = impl_from_ID3D12Device4(iface); struct d3d12_device *device = impl_from_ID3D12Device5(iface);
TRACE("iface %p, luid %p.\n", iface, luid); TRACE("iface %p, luid %p.\n", iface, luid);
@ -3927,7 +3928,7 @@ static LUID * STDMETHODCALLTYPE d3d12_device_GetAdapterLuid(ID3D12Device4 *iface
return luid; return luid;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePipelineLibrary(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePipelineLibrary(ID3D12Device5 *iface,
const void *blob, SIZE_T blob_size, REFIID iid, void **lib) const void *blob, SIZE_T blob_size, REFIID iid, void **lib)
{ {
FIXME("iface %p, blob %p, blob_size %lu, iid %s, lib %p stub!\n", iface, blob, blob_size, debugstr_guid(iid), lib); FIXME("iface %p, blob %p, blob_size %lu, iid %s, lib %p stub!\n", iface, blob, blob_size, debugstr_guid(iid), lib);
@ -3935,7 +3936,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePipelineLibrary(ID3D12Device
return DXGI_ERROR_UNSUPPORTED; return DXGI_ERROR_UNSUPPORTED;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_SetEventOnMultipleFenceCompletion(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_SetEventOnMultipleFenceCompletion(ID3D12Device5 *iface,
ID3D12Fence *const *fences, const UINT64 *values, UINT fence_count, ID3D12Fence *const *fences, const UINT64 *values, UINT fence_count,
D3D12_MULTIPLE_FENCE_WAIT_FLAGS flags, HANDLE event) D3D12_MULTIPLE_FENCE_WAIT_FLAGS flags, HANDLE event)
{ {
@ -3945,7 +3946,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_SetEventOnMultipleFenceCompletion(
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_SetResidencyPriority(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_SetResidencyPriority(ID3D12Device5 *iface,
UINT object_count, ID3D12Pageable *const *objects, const D3D12_RESIDENCY_PRIORITY *priorities) UINT object_count, ID3D12Pageable *const *objects, const D3D12_RESIDENCY_PRIORITY *priorities)
{ {
FIXME_ONCE("iface %p, object_count %u, objects %p, priorities %p stub!\n", iface, object_count, objects, priorities); FIXME_ONCE("iface %p, object_count %u, objects %p, priorities %p stub!\n", iface, object_count, objects, priorities);
@ -3953,7 +3954,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_SetResidencyPriority(ID3D12Device4
return S_OK; return S_OK;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePipelineState(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePipelineState(ID3D12Device5 *iface,
const D3D12_PIPELINE_STATE_STREAM_DESC *desc, REFIID iid, void **pipeline_state) const D3D12_PIPELINE_STATE_STREAM_DESC *desc, REFIID iid, void **pipeline_state)
{ {
FIXME("iface %p, desc %p, iid %s, pipeline_state %p stub!\n", iface, desc, debugstr_guid(iid), pipeline_state); FIXME("iface %p, desc %p, iid %s, pipeline_state %p stub!\n", iface, desc, debugstr_guid(iid), pipeline_state);
@ -3961,7 +3962,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePipelineState(ID3D12Device4
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_OpenExistingHeapFromAddress(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_OpenExistingHeapFromAddress(ID3D12Device5 *iface,
const void *address, REFIID iid, void **heap) const void *address, REFIID iid, void **heap)
{ {
FIXME("iface %p, address %p, iid %s, heap %p stub!\n", iface, address, debugstr_guid(iid), heap); FIXME("iface %p, address %p, iid %s, heap %p stub!\n", iface, address, debugstr_guid(iid), heap);
@ -3969,7 +3970,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenExistingHeapFromAddress(ID3D12
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_OpenExistingHeapFromFileMapping(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_OpenExistingHeapFromFileMapping(ID3D12Device5 *iface,
HANDLE file_mapping, REFIID iid, void **heap) HANDLE file_mapping, REFIID iid, void **heap)
{ {
FIXME("iface %p, file_mapping %p, iid %s, heap %p stub!\n", iface, file_mapping, debugstr_guid(iid), heap); FIXME("iface %p, file_mapping %p, iid %s, heap %p stub!\n", iface, file_mapping, debugstr_guid(iid), heap);
@ -3977,7 +3978,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenExistingHeapFromFileMapping(ID
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_EnqueueMakeResident(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_EnqueueMakeResident(ID3D12Device5 *iface,
D3D12_RESIDENCY_FLAGS flags, UINT num_objects, ID3D12Pageable *const *objects, D3D12_RESIDENCY_FLAGS flags, UINT num_objects, ID3D12Pageable *const *objects,
ID3D12Fence *fence, UINT64 fence_value) ID3D12Fence *fence, UINT64 fence_value)
{ {
@ -3987,7 +3988,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_EnqueueMakeResident(ID3D12Device4
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList1(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList1(ID3D12Device5 *iface,
UINT node_mask, D3D12_COMMAND_LIST_TYPE type, D3D12_COMMAND_LIST_FLAGS flags, UINT node_mask, D3D12_COMMAND_LIST_TYPE type, D3D12_COMMAND_LIST_FLAGS flags,
REFIID iid, void **command_list) REFIID iid, void **command_list)
{ {
@ -3997,7 +3998,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList1(ID3D12Device4 *
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateProtectedResourceSession(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateProtectedResourceSession(ID3D12Device5 *iface,
const D3D12_PROTECTED_RESOURCE_SESSION_DESC *desc, REFIID iid, void **session) const D3D12_PROTECTED_RESOURCE_SESSION_DESC *desc, REFIID iid, void **session)
{ {
FIXME("iface %p, desc %p, iid %s, session %p stub!\n", iface, desc, debugstr_guid(iid), session); FIXME("iface %p, desc %p, iid %s, session %p stub!\n", iface, desc, debugstr_guid(iid), session);
@ -4005,7 +4006,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateProtectedResourceSession(ID3
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource1(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource1(ID3D12Device5 *iface,
const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
const D3D12_CLEAR_VALUE *optimized_clear_value, const D3D12_CLEAR_VALUE *optimized_clear_value,
@ -4019,7 +4020,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource1(ID3D12Dev
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap1(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap1(ID3D12Device5 *iface,
const D3D12_HEAP_DESC *desc, ID3D12ProtectedResourceSession *protected_session, const D3D12_HEAP_DESC *desc, ID3D12ProtectedResourceSession *protected_session,
REFIID iid, void **heap) REFIID iid, void **heap)
{ {
@ -4029,7 +4030,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap1(ID3D12Device4 *iface,
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource1(ID3D12Device4 *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource1(ID3D12Device5 *iface,
const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
const D3D12_CLEAR_VALUE *optimized_clear_value, const D3D12_CLEAR_VALUE *optimized_clear_value,
ID3D12ProtectedResourceSession *protected_session, REFIID iid, void **resource) ID3D12ProtectedResourceSession *protected_session, REFIID iid, void **resource)
@ -4043,7 +4044,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource1(ID3D12Devi
} }
static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResourceAllocationInfo1( static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResourceAllocationInfo1(
ID3D12Device4 *iface, D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask, ID3D12Device5 *iface, D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask,
UINT count, const D3D12_RESOURCE_DESC *resource_descs, UINT count, const D3D12_RESOURCE_DESC *resource_descs,
D3D12_RESOURCE_ALLOCATION_INFO1 *info1) D3D12_RESOURCE_ALLOCATION_INFO1 *info1)
{ {
@ -4053,7 +4054,76 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour
return info; return info;
} }
static const struct ID3D12Device4Vtbl d3d12_device_vtbl = static HRESULT STDMETHODCALLTYPE d3d12_device_CreateLifetimeTracker(ID3D12Device5 *iface,
ID3D12LifetimeOwner *owner, REFIID iid, void **tracker)
{
FIXME("iface %p, owner %p, iid %s, tracker %p stub!\n", iface, owner, debugstr_guid(iid), tracker);
return E_NOTIMPL;
}
static void STDMETHODCALLTYPE d3d12_device_RemoveDevice(ID3D12Device5 *iface)
{
FIXME("iface %p stub!\n", iface);
}
static HRESULT STDMETHODCALLTYPE d3d12_device_EnumerateMetaCommands(ID3D12Device5 *iface,
UINT *num_meta_commands, D3D12_META_COMMAND_DESC *command_desc)
{
FIXME("iface %p, num_meta_commands %p, command_desc %p stub!\n", iface,
num_meta_commands, command_desc);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d12_device_EnumerateMetaCommandParameters(ID3D12Device5 *iface,
REFGUID command_id, D3D12_META_COMMAND_PARAMETER_STAGE stage,
UINT *size_in_bytes, UINT *parameter_count,
D3D12_META_COMMAND_PARAMETER_DESC *parameter_desc)
{
FIXME("iface %p, command_id %s, stage %u, size_in_bytes %p, "
"parameter_count %p, parameter_desc %p stub!\n", iface,
debugstr_guid(command_id), stage, size_in_bytes, parameter_count, parameter_desc);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateMetaCommand(ID3D12Device5 *iface,
REFGUID command_id, UINT node_mask, const void *parameters_data,
SIZE_T data_size_in_bytes, REFIID iid, void **meta_command)
{
FIXME("iface %p, command_id %s, node_mask %#x, parameters_data %p, "
"data_size_in_bytes %lu, iid %s, meta_command %p stub!\n", iface,
debugstr_guid(command_id), node_mask, parameters_data,
data_size_in_bytes, debugstr_guid(iid), meta_command);
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE d3d12_device_CreateStateObject(ID3D12Device5 *iface,
const D3D12_STATE_OBJECT_DESC *desc, REFIID iid, void **state_object)
{
FIXME("iface %p, desc %p, iid %s, state_object %p stub!\n", iface, desc, debugstr_guid(iid), state_object);
return E_NOTIMPL;
}
static void STDMETHODCALLTYPE d3d12_device_GetRaytracingAccelerationStructurePrebuildInfo(ID3D12Device5 *iface,
const D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS *desc,
D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFO *info)
{
FIXME("iface %p, desc %p, info %p stub!\n", iface, desc, info);
}
static D3D12_DRIVER_MATCHING_IDENTIFIER_STATUS STDMETHODCALLTYPE d3d12_device_CheckDriverMatchingIdentifier(ID3D12Device5 *iface,
D3D12_SERIALIZED_DATA_TYPE data_type, const D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER *identifier)
{
FIXME("iface %p, data_type %u, identifier %p stub!\n", iface, data_type, identifier);
return D3D12_DRIVER_MATCHING_IDENTIFIER_UNRECOGNIZED;
}
static const struct ID3D12Device5Vtbl d3d12_device_vtbl =
{ {
/* IUnknown methods */ /* IUnknown methods */
d3d12_device_QueryInterface, d3d12_device_QueryInterface,
@ -4119,14 +4189,23 @@ static const struct ID3D12Device4Vtbl d3d12_device_vtbl =
d3d12_device_CreateHeap1, d3d12_device_CreateHeap1,
d3d12_device_CreateReservedResource1, d3d12_device_CreateReservedResource1,
d3d12_device_GetResourceAllocationInfo1, d3d12_device_GetResourceAllocationInfo1,
/* ID3D12Device5 methods */
d3d12_device_CreateLifetimeTracker,
d3d12_device_RemoveDevice,
d3d12_device_EnumerateMetaCommands,
d3d12_device_EnumerateMetaCommandParameters,
d3d12_device_CreateMetaCommand,
d3d12_device_CreateStateObject,
d3d12_device_GetRaytracingAccelerationStructurePrebuildInfo,
d3d12_device_CheckDriverMatchingIdentifier,
}; };
struct d3d12_device *unsafe_impl_from_ID3D12Device4(ID3D12Device4 *iface) struct d3d12_device *unsafe_impl_from_ID3D12Device5(ID3D12Device5 *iface)
{ {
if (!iface) if (!iface)
return NULL; return NULL;
assert(iface->lpVtbl == &d3d12_device_vtbl); assert(iface->lpVtbl == &d3d12_device_vtbl);
return impl_from_ID3D12Device4(iface); return impl_from_ID3D12Device5(iface);
} }
static HRESULT d3d12_device_init(struct d3d12_device *device, static HRESULT d3d12_device_init(struct d3d12_device *device,
@ -4135,7 +4214,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device,
const struct vkd3d_vk_device_procs *vk_procs; const struct vkd3d_vk_device_procs *vk_procs;
HRESULT hr; HRESULT hr;
device->ID3D12Device4_iface.lpVtbl = &d3d12_device_vtbl; device->ID3D12Device5_iface.lpVtbl = &d3d12_device_vtbl;
device->refcount = 1; device->refcount = 1;
vkd3d_instance_incref(device->vkd3d_instance = instance); vkd3d_instance_incref(device->vkd3d_instance = instance);
@ -4332,28 +4411,28 @@ HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_ha
IUnknown *vkd3d_get_device_parent(ID3D12Device *device) IUnknown *vkd3d_get_device_parent(ID3D12Device *device)
{ {
struct d3d12_device *d3d12_device = impl_from_ID3D12Device4((ID3D12Device4 *)device); struct d3d12_device *d3d12_device = impl_from_ID3D12Device5((ID3D12Device5 *)device);
return d3d12_device->parent; return d3d12_device->parent;
} }
VkDevice vkd3d_get_vk_device(ID3D12Device *device) VkDevice vkd3d_get_vk_device(ID3D12Device *device)
{ {
struct d3d12_device *d3d12_device = impl_from_ID3D12Device4((ID3D12Device4 *)device); struct d3d12_device *d3d12_device = impl_from_ID3D12Device5((ID3D12Device5 *)device);
return d3d12_device->vk_device; return d3d12_device->vk_device;
} }
VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device) VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device)
{ {
struct d3d12_device *d3d12_device = impl_from_ID3D12Device4((ID3D12Device4 *)device); struct d3d12_device *d3d12_device = impl_from_ID3D12Device5((ID3D12Device5 *)device);
return d3d12_device->vk_physical_device; return d3d12_device->vk_physical_device;
} }
struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device) struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device)
{ {
struct d3d12_device *d3d12_device = impl_from_ID3D12Device4((ID3D12Device4 *)device); struct d3d12_device *d3d12_device = impl_from_ID3D12Device5((ID3D12Device5 *)device);
return d3d12_device->vkd3d_instance; return d3d12_device->vkd3d_instance;
} }

2
libs/vkd3d/resource.c
View File

@ -2220,7 +2220,7 @@ HRESULT d3d12_reserved_resource_create(struct d3d12_device *device,
HRESULT vkd3d_create_image_resource(ID3D12Device *device, HRESULT vkd3d_create_image_resource(ID3D12Device *device,
const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource) const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource)
{ {
struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device4((ID3D12Device4 *)device); struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device5((ID3D12Device5 *)device);
struct d3d12_resource *object; struct d3d12_resource *object;
HRESULT hr; HRESULT hr;

4
libs/vkd3d/vkd3d_main.c
View File

@ -71,11 +71,11 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info,
if (!device) if (!device)
{ {
ID3D12Device_Release(&object->ID3D12Device4_iface); ID3D12Device_Release(&object->ID3D12Device5_iface);
return S_FALSE; return S_FALSE;
} }
return return_interface(&object->ID3D12Device4_iface, &IID_ID3D12Device, iid, device); return return_interface(&object->ID3D12Device5_iface, &IID_ID3D12Device, iid, device);
} }
/* ID3D12RootSignatureDeserializer */ /* ID3D12RootSignatureDeserializer */

12
libs/vkd3d/vkd3d_private.h
View File

@ -1711,7 +1711,7 @@ struct vkd3d_desc_object_cache
/* ID3D12Device */ /* ID3D12Device */
struct d3d12_device struct d3d12_device
{ {
ID3D12Device4 ID3D12Device4_iface; ID3D12Device5 ID3D12Device5_iface;
LONG refcount; LONG refcount;
VkDevice vk_device; VkDevice vk_device;
@ -1777,27 +1777,27 @@ struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device, D3
bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent); bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent);
void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason,
const char *message, ...) VKD3D_PRINTF_FUNC(3, 4); const char *message, ...) VKD3D_PRINTF_FUNC(3, 4);
struct d3d12_device *unsafe_impl_from_ID3D12Device4(ID3D12Device4 *iface); struct d3d12_device *unsafe_impl_from_ID3D12Device5(ID3D12Device5 *iface);
static inline HRESULT d3d12_device_query_interface(struct d3d12_device *device, REFIID iid, void **object) static inline HRESULT d3d12_device_query_interface(struct d3d12_device *device, REFIID iid, void **object)
{ {
return ID3D12Device4_QueryInterface(&device->ID3D12Device4_iface, iid, object); return ID3D12Device5_QueryInterface(&device->ID3D12Device5_iface, iid, object);
} }
static inline ULONG d3d12_device_add_ref(struct d3d12_device *device) static inline ULONG d3d12_device_add_ref(struct d3d12_device *device)
{ {
return ID3D12Device4_AddRef(&device->ID3D12Device4_iface); return ID3D12Device5_AddRef(&device->ID3D12Device5_iface);
} }
static inline ULONG d3d12_device_release(struct d3d12_device *device) static inline ULONG d3d12_device_release(struct d3d12_device *device)
{ {
return ID3D12Device4_Release(&device->ID3D12Device4_iface); return ID3D12Device5_Release(&device->ID3D12Device5_iface);
} }
static inline unsigned int d3d12_device_get_descriptor_handle_increment_size(struct d3d12_device *device, static inline unsigned int d3d12_device_get_descriptor_handle_increment_size(struct d3d12_device *device,
D3D12_DESCRIPTOR_HEAP_TYPE descriptor_type) D3D12_DESCRIPTOR_HEAP_TYPE descriptor_type)
{ {
return ID3D12Device4_GetDescriptorHandleIncrementSize(&device->ID3D12Device4_iface, descriptor_type); return ID3D12Device5_GetDescriptorHandleIncrementSize(&device->ID3D12Device5_iface, descriptor_type);
} }
/* utils */ /* utils */