Henri Verbeet : wined3d: Introduce wined3d_context_vk_reference_texture().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0aee4d9a8800d25227a86c37cbfe0fde9e362fe5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0aee4d9a8800d25227a86c37cbfe0fde9e362fe5

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Apr 24 02:39:23 2020 +0430

wined3d: Introduce wined3d_context_vk_reference_texture().

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

---

 dlls/wined3d/texture.c         | 6 +++---
 dlls/wined3d/wined3d_private.h | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 6b833cc4ec..7a219a9521 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -4624,7 +4624,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context,
             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->vk_image, aspect_mask);
-    dst_texture_vk->command_buffer_id = context_vk->current_command_buffer.id;
+    wined3d_context_vk_reference_texture(context_vk, dst_texture_vk);
     wined3d_context_vk_reference_bo(context_vk, &staging_bo);
     wined3d_context_vk_destroy_bo(context_vk, &staging_bo);
 }
@@ -4757,7 +4757,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context,
             VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,  src_texture_vk->layout,
             src_texture_vk->vk_image, aspect_mask);
 
-    src_texture_vk->command_buffer_id = context_vk->current_command_buffer.id;
+    wined3d_context_vk_reference_texture(context_vk, src_texture_vk);
     wined3d_context_vk_reference_bo(context_vk, &staging_bo);
     wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL);
     wined3d_context_vk_wait_command_buffer(context_vk, src_texture_vk->command_buffer_id);
@@ -4977,7 +4977,7 @@ static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *textur
         return FALSE;
     }
 
-    texture_vk->command_buffer_id = context_vk->current_command_buffer.id;
+    wined3d_context_vk_reference_texture(context_vk, texture_vk);
     wined3d_context_vk_image_barrier(context_vk, vk_command_buffer,
             VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
             0, 0,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c4957d9bbc..22e1f5160b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5488,6 +5488,12 @@ static inline void wined3d_context_vk_reference_bo(struct wined3d_context_vk *co
     bo->command_buffer_id = context_vk->current_command_buffer.id;
 }
 
+static inline void wined3d_context_vk_reference_texture(struct wined3d_context_vk *context_vk,
+        struct wined3d_texture_vk *texture_vk)
+{
+    texture_vk->command_buffer_id = context_vk->current_command_buffer.id;
+}
+
 static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv,
         const struct wined3d_format *srv_format)
 {