Zhiyi Zhang : vkd3d: Implement d3d12_resource_SetName().

Alexandre Julliard julliard at winehq.org
Wed Jan 30 17:36:01 CST 2019


Module: vkd3d
Branch: master
Commit: 875577bb8998b16955a8433d04a19921486fb5b2
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=875577bb8998b16955a8433d04a19921486fb5b2

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Wed Jan 30 01:02:32 2019 +0330

vkd3d: Implement d3d12_resource_SetName().

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d/resource.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 158240d..3f44712 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -842,10 +842,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_SetPrivateDataInterface(ID3D12Re
 static HRESULT STDMETHODCALLTYPE d3d12_resource_SetName(ID3D12Resource *iface, const WCHAR *name)
 {
     struct d3d12_resource *resource = impl_from_ID3D12Resource(iface);
+    HRESULT hr;
 
-    FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, resource->device->wchar_size));
+    TRACE("iface %p, name %s.\n", iface, debugstr_w(name, resource->device->wchar_size));
 
-    return E_NOTIMPL;
+    if (resource->vk_memory)
+    {
+        if (FAILED(hr = vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->vk_memory,
+                VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, name)))
+            return hr;
+    }
+
+    if (d3d12_resource_is_buffer(resource))
+        return vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->u.vk_buffer,
+                VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, name);
+    else
+        return vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->u.vk_image,
+                VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, name);
 }
 
 static HRESULT STDMETHODCALLTYPE d3d12_resource_GetDevice(ID3D12Resource *iface,




More information about the wine-cvs mailing list