Henri Verbeet : wined3d: Send resource destruction through the command stream.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 38f3d59ed694afba7913b4992d13cb044a09126c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=38f3d59ed694afba7913b4992d13cb044a09126c

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jul  8 10:59:01 2016 +0200

wined3d: Send resource destruction through the command stream.

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

---

 dlls/wined3d/device.c   |  2 --
 dlls/wined3d/resource.c | 11 +++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b52970f..32e7092 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4993,8 +4993,6 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso
 
     TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type));
 
-    context_resource_released(device, resource, type);
-
     for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i)
     {
         if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource)
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index be7dfb4..a475dc0 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -233,6 +233,14 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
     return WINED3D_OK;
 }
 
+static void wined3d_resource_destroy_object(void *object)
+{
+    struct wined3d_resource *resource = object;
+
+    wined3d_resource_free_sysmem(resource);
+    context_resource_released(resource->device, resource, resource->type);
+}
+
 void resource_cleanup(struct wined3d_resource *resource)
 {
     const struct wined3d *d3d = resource->device->wined3d;
@@ -245,9 +253,8 @@ void resource_cleanup(struct wined3d_resource *resource)
         adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size);
     }
 
-    wined3d_resource_free_sysmem(resource);
-
     device_resource_released(resource->device, resource);
+    wined3d_cs_emit_destroy_object(resource->device->cs, wined3d_resource_destroy_object, resource);
 }
 
 void resource_unload(struct wined3d_resource *resource)