Conor McCarthy : vkd3d: Don't copy an entire descriptor when destroying a view.

[Alexandre Julliard]

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

Author: Conor McCarthy 
Date:   Thu Dec  9 01:00:22 2021 +1000

vkd3d: Don't copy an entire descriptor when destroying a view.

Based on a vkd3d-proton patch by Philip Rebohle.

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

---

libs/vkd3d/resource.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 1991223..fb5346e 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -2121,26 +2121,24 @@ void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device)
 void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src,
         struct d3d12_device *device)
 {
-    struct d3d12_desc destroy_desc;
+    struct vkd3d_view *defunct_view = NULL;
     pthread_mutex_t *mutex;

-    destroy_desc.u.view = NULL;
-
     mutex = d3d12_device_get_descriptor_mutex(device, dst);
     pthread_mutex_lock(mutex);

/* Nothing to do for VKD3D_DESCRIPTOR_MAGIC_CBV. */
     if ((dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW)
             && !InterlockedDecrement(&dst->u.view->refcount))
-        destroy_desc = *dst;
+        defunct_view = dst->u.view;

*dst = *src;

pthread_mutex_unlock(mutex);

/* Destroy the view after unlocking to reduce wait time. */
-    if (destroy_desc.u.view)
-        vkd3d_view_destroy(destroy_desc.u.view, device);
+    if (defunct_view)
+        vkd3d_view_destroy(defunct_view, device);
 }

static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device)