Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_CopyTextureRegion().
Alexandre Julliard
julliard at winehq.org
Fri Jan 21 15:50:56 CST 2022
Module: vkd3d
Branch: master
Commit: 8e30a7750e36a294a0693f5121769f1350e2109c
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e30a7750e36a294a0693f5121769f1350e2109c
Author: Conor McCarthy <cmccarthy at codeweavers.com>
Date: Fri Jan 21 22:45:28 2022 +1000
vkd3d: Use the resource's stored format in d3d12_command_list_CopyTextureRegion().
Signed-off-by: Conor McCarthy <cmccarthy 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 | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 73ba226..2cf1eba 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3562,18 +3562,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic
assert(d3d12_resource_is_texture(dst_resource));
assert(d3d12_resource_is_texture(src_resource));
- if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->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(list->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->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT)
&& (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT))
More information about the wine-cvs
mailing list