[PATCH 0/1] MR624: vkd3d: Introduce a debug helper for CPU descriptor handles.

[PATCH 1/1] vkd3d: Introduce a debug helper for CPU descriptor handles.

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d/command.c       | 16 ++++++++--------
 libs/vkd3d/device.c        | 28 ++++++++++++++--------------
 libs/vkd3d/utils.c         |  5 +++++
 libs/vkd3d/vkd3d_private.h |  1 +
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 3cf58e06d..f9940b3d3 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -5132,8 +5132,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra
     struct VkAttachmentDescription attachment_desc;
     struct VkAttachmentReference ds_reference;

-    TRACE("iface %p, dsv %#lx, flags %#x, depth %.8e, stencil 0x%02x, rect_count %u, rects %p.\n",
-            iface, dsv.ptr, flags, depth, stencil, rect_count, rects);
+    TRACE("iface %p, dsv %s, flags %#x, depth %.8e, stencil 0x%02x, rect_count %u, rects %p.\n",
+            iface, debug_cpu_handle(dsv), flags, depth, stencil, rect_count, rects);

d3d12_command_list_track_resource_usage(list, dsv_desc->resource);

@@ -5180,8 +5180,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra
     struct VkAttachmentReference color_reference;
     VkClearValue clear_value;

-    TRACE("iface %p, rtv %#lx, color %p, rect_count %u, rects %p.\n",
-            iface, rtv.ptr, color, rect_count, rects);
+    TRACE("iface %p, rtv %s, color %p, rect_count %u, rects %p.\n",
+            iface, debug_cpu_handle(rtv), color, rect_count, rects);

d3d12_command_list_track_resource_usage(list, rtv_desc->resource);

@@ -5432,8 +5432,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID
     struct d3d12_resource *resource_impl;
     VkClearColorValue colour;

-    TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n",
-            iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects);
+    TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %s, resource %p, values %p, rect_count %u, rects %p.\n",
+            iface, gpu_handle.ptr, debug_cpu_handle(cpu_handle), resource, values, rect_count, rects);

resource_impl = unsafe_impl_from_ID3D12Resource(resource);
     if (!(descriptor = d3d12_desc_from_cpu_handle(cpu_handle)->s.u.view))
@@ -5496,8 +5496,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I
     VkClearColorValue colour;
     struct vkd3d_view *view;

-    TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n",
-            iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects);
+    TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %s, resource %p, values %p, rect_count %u, rects %p.\n",
+            iface, gpu_handle.ptr, debug_cpu_handle(cpu_handle), resource, values, rect_count, rects);

resource_impl = unsafe_impl_from_ID3D12Resource(resource);
     if (!(view = d3d12_desc_from_cpu_handle(cpu_handle)->s.u.view))
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index e45072b93..5a0d8c298 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -3418,7 +3418,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device
     struct d3d12_device *device = impl_from_ID3D12Device5(iface);
     struct d3d12_desc tmp = {0};

-    TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr);
+    TRACE("iface %p, desc %p, descriptor %s.\n", iface, desc, debug_cpu_handle(descriptor));

d3d12_desc_create_cbv(&tmp, device, desc);
     d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device);
@@ -3431,8 +3431,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device
     struct d3d12_device *device = impl_from_ID3D12Device5(iface);
     struct d3d12_desc tmp = {0};

-    TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n",
-            iface, resource, desc, descriptor.ptr);
+    TRACE("iface %p, resource %p, desc %p, descriptor %s.\n",
+            iface, resource, desc, debug_cpu_handle(descriptor));

d3d12_desc_create_srv(&tmp, device, unsafe_impl_from_ID3D12Resource(resource), desc);
     d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device);
@@ -3445,8 +3445,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Devic
     struct d3d12_device *device = impl_from_ID3D12Device5(iface);
     struct d3d12_desc tmp = {0};

-    TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %#lx.\n",
-            iface, resource, counter_resource, desc, descriptor.ptr);
+    TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %s.\n",
+            iface, resource, counter_resource, desc, debug_cpu_handle(descriptor));

d3d12_desc_create_uav(&tmp, device, unsafe_impl_from_ID3D12Resource(resource),
             unsafe_impl_from_ID3D12Resource(counter_resource), desc);
@@ -3457,8 +3457,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device5
         ID3D12Resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc,
         D3D12_CPU_DESCRIPTOR_HANDLE descriptor)
 {
-    TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n",
-            iface, resource, desc, descriptor.ptr);
+    TRACE("iface %p, resource %p, desc %p, descriptor %s.\n",
+            iface, resource, desc, debug_cpu_handle(descriptor));

d3d12_rtv_desc_create_rtv(d3d12_rtv_desc_from_cpu_handle(descriptor),
             impl_from_ID3D12Device5(iface), unsafe_impl_from_ID3D12Resource(resource), desc);
@@ -3468,8 +3468,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device5
         ID3D12Resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc,
         D3D12_CPU_DESCRIPTOR_HANDLE descriptor)
 {
-    TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n",
-            iface, resource, desc, descriptor.ptr);
+    TRACE("iface %p, resource %p, desc %p, descriptor %s.\n",
+            iface, resource, desc, debug_cpu_handle(descriptor));

d3d12_dsv_desc_create_dsv(d3d12_dsv_desc_from_cpu_handle(descriptor),
             impl_from_ID3D12Device5(iface), unsafe_impl_from_ID3D12Resource(resource), desc);
@@ -3481,7 +3481,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device5 *iface,
     struct d3d12_device *device = impl_from_ID3D12Device5(iface);
     struct d3d12_desc tmp = {0};

-    TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr);
+    TRACE("iface %p, desc %p, descriptor %s.\n", iface, desc, debug_cpu_handle(descriptor));

d3d12_desc_create_sampler(&tmp, device, desc);
     d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device);
@@ -3555,10 +3555,10 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device5 *
         const D3D12_CPU_DESCRIPTOR_HANDLE src_descriptor_range_offset,
         D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type)
 {
-    TRACE("iface %p, descriptor_count %u, dst_descriptor_range_offset %#lx, "
-            "src_descriptor_range_offset %#lx, descriptor_heap_type %#x.\n",
-            iface, descriptor_count, dst_descriptor_range_offset.ptr, src_descriptor_range_offset.ptr,
-            descriptor_heap_type);
+    TRACE("iface %p, descriptor_count %u, dst_descriptor_range_offset %s, "
+            "src_descriptor_range_offset %s, descriptor_heap_type %#x.\n",
+            iface, descriptor_count, debug_cpu_handle(dst_descriptor_range_offset),
+            debug_cpu_handle(src_descriptor_range_offset), descriptor_heap_type);

d3d12_device_CopyDescriptors(iface, 1, &dst_descriptor_range_offset, &descriptor_count,
             1, &src_descriptor_range_offset, &descriptor_count, descriptor_heap_type);
diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c
index 751971220..28913a83e 100644
--- a/libs/vkd3d/utils.c
+++ b/libs/vkd3d/utils.c
@@ -632,6 +632,11 @@ HRESULT return_interface(void *iface, REFIID iface_iid,
     return hr;
 }

+const char *debug_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE handle)
+{
+    return vkd3d_dbg_sprintf("{%#"PRIxPTR"}", (uintptr_t)handle.ptr);
+}
+
 const char *debug_d3d12_box(const D3D12_BOX *box)
 {
     if (!box)
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index bfe4d514e..24fce73e0 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -1953,6 +1953,7 @@ bool is_write_resource_state(D3D12_RESOURCE_STATES state);

HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object);

+const char *debug_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE handle);
 const char *debug_d3d12_box(const D3D12_BOX *box);
 const char *debug_d3d12_shader_component_mapping(unsigned int mapping);
 const char *debug_vk_extent_3d(VkExtent3D extent);

[PATCH 0/1] MR624: vkd3d: Introduce a debug helper for CPU descriptor handles. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.