[PATCH 7/8] wined3d: Reduce layout switches in texture data uploads.

[Stefan Dösinger]

From: Stefan Dösinger

---
 dlls/wined3d/texture.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index d246126eab5..4dbfb04c101 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -5091,12 +5091,19 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context,
     VK_CALL(vkCmdCopyBufferToImage(vk_command_buffer, src_bo->vk_buffer,
             dst_texture_vk->image.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region));

-    wined3d_context_vk_image_barrier(context_vk, vk_command_buffer,
-            VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
-            VK_ACCESS_TRANSFER_WRITE_BIT,
-            vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags),
-            VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->layout,
-            dst_texture_vk->image.vk_image, &vk_range);
+    dst_texture_vk->bind_mask = WINED3D_BIND_TRANSFER_DST;
+    if (dst_texture->layer_count * dst_texture->level_count > 1)
+    {
+        wined3d_context_vk_image_barrier(context_vk, vk_command_buffer,
+                VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+                VK_ACCESS_TRANSFER_WRITE_BIT,
+                vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags),
+                VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->layout,
+                dst_texture_vk->image.vk_image, &vk_range);
+    }
+    else
+        dst_texture_vk->layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+
     wined3d_context_vk_reference_texture(context_vk, dst_texture_vk);
     wined3d_context_vk_reference_bo(context_vk, src_bo);