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

[Alexandre Julliard]

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

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Tue Jan 18 14:52:10 2022 +1000

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

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d/command.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 421a3c8..9ea9d7f 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -4057,15 +4057,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC
         }
         else
         {
-            const struct vkd3d_format *format;
             VkImageMemoryBarrier vk_barrier;
 
-            if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0)))
-            {
-                ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format);
-                continue;
-            }
-
             vk_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
             vk_barrier.pNext = NULL;
             vk_barrier.srcAccessMask = src_access_mask;
@@ -4076,7 +4069,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC
             vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
             vk_barrier.image = resource->u.vk_image;
 
-            vk_barrier.subresourceRange.aspectMask = format->vk_aspect_mask;
+            vk_barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask;
             if (sub_resource_idx == D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES)
             {
                 vk_barrier.subresourceRange.baseMipLevel = 0;