=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: libs/vkd3d: Factor out debug_ignored_node_mask().
Alexandre Julliard
julliard at winehq.org
Fri Jul 20 11:41:38 CDT 2018
Module: vkd3d
Branch: master
Commit: cc47b37c1d1f511eb1983795bef0c2cb32521fd1
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cc47b37c1d1f511eb1983795bef0c2cb32521fd1
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Jul 20 14:30:17 2018 +0200
libs/vkd3d: Factor out debug_ignored_node_mask().
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/command.c | 3 +--
libs/vkd3d/device.c | 7 +++++--
libs/vkd3d/vkd3d_private.h | 6 ++++++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index d29d18e..4db9967 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -4045,8 +4045,7 @@ HRESULT d3d12_command_list_create(struct d3d12_device *device,
return E_INVALIDARG;
}
- if (node_mask && node_mask != 1)
- FIXME("Multi-adapter not supported.\n");
+ debug_ignored_node_mask(node_mask);
if (!(object = vkd3d_malloc(sizeof(*object))))
return E_OUTOFMEMORY;
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 5d2c91f..176b0d4 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1663,8 +1663,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device *
TRACE("iface %p, node_mask 0x%08x, bytecode %p, bytecode_length %lu, riid %s, root_signature %p.\n",
iface, node_mask, bytecode, bytecode_length, debugstr_guid(riid), root_signature);
- if (node_mask && node_mask != 1)
- FIXME("Ignoring node mask 0x%08x.\n", node_mask);
+ debug_ignored_node_mask(node_mask);
if (FAILED(hr = d3d12_root_signature_create(device, bytecode, bytecode_length, &object)))
return hr;
@@ -1816,6 +1815,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour
"resource_descs %p stub!\n",
iface, allocation_info, visible_mask, resource_desc_count, resource_descs);
+ debug_ignored_node_mask(visible_mask);
+
return allocation_info;
}
@@ -1825,6 +1826,8 @@ static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapPrope
FIXME("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n",
iface, heap_properties, node_mask, heap_type);
+ debug_ignored_node_mask(node_mask);
+
return heap_properties;
}
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index e9ee06a..0adc2e4 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -786,6 +786,12 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN;
const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN;
const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN;
+static inline void debug_ignored_node_mask(unsigned int mask)
+{
+ if (mask && mask != 1)
+ FIXME("Ignoring node mask 0x%08x.\n", mask);
+}
+
HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN;
HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list