Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_ResolveSubresource().

[Alexandre Julliard]

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

Author: Conor McCarthy 
Date:   Tue Jan 18 15:07:58 2022 +1000

vkd3d: Use the resource's stored format in d3d12_command_list_ResolveSubresource().

Signed-off-by: Conor McCarthy 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

libs/vkd3d/command.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index f8e9918..6689c1a 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3663,16 +3663,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi

d3d12_command_list_end_current_render_pass(list);

-    if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(device, &dst_resource->desc, DXGI_FORMAT_UNKNOWN)))
-    {
-        WARN("Invalid format %#x.\n", dst_resource->desc.Format);
-        return;
-    }
-    if (!(src_format = vkd3d_format_from_d3d12_resource_desc(device, &src_resource->desc, DXGI_FORMAT_UNKNOWN)))
-    {
-        WARN("Invalid format %#x.\n", src_resource->desc.Format);
-        return;
-    }
+    dst_format = dst_resource->format;
+    src_format = src_resource->format;

if (dst_format->type == VKD3D_FORMAT_TYPE_TYPELESS || src_format->type == VKD3D_FORMAT_TYPE_TYPELESS)
     {