wined3d: Send shader destruction through the command stream.

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

wined3d: Send shader destruction through the command stream.
87f667b4 · Henri Verbeet · Alexandre Julliard · 29788075 · 87f667b4
Commit 87f667b4 authored Jun 22, 2016 by Henri Verbeet Committed by Alexandre Julliard Jun 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

shader.c dlls/wined3d/shader.c +7 -2

No files found.
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -2650,6 +2650,12 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader)
    return refcount;
 }

+static void wined3d_shader_destroy_object(void *object)
+{
+    shader_cleanup(object);
+    HeapFree(GetProcessHeap(), 0, object);
+}
+
 ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader)
 {
    ULONG refcount = InterlockedDecrement(&shader->ref);
@@ -2658,9 +2664,8 @@ ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader)

    if (!refcount)
    {
-        shader_cleanup(shader);
        shader->parent_ops->wined3d_object_destroyed(shader->parent);
-        HeapFree(GetProcessHeap(), 0, shader);
+        wined3d_cs_emit_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader);
    }

    return refcount;