wined3d: Send vertex declaration destruction through the command stream.

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

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

Showing with 10 additions and 2 deletions

vertexdeclaration.c dlls/wined3d/vertexdeclaration.c +10 -2

No files found.
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -50,6 +50,14 @@ ULONG CDECL wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration 
    return refcount;
 }

+static void wined3d_vertex_declaration_destroy_object(void *object)
+{
+    struct wined3d_vertex_declaration *declaration = object;
+
+    HeapFree(GetProcessHeap(), 0, declaration->elements);
+    HeapFree(GetProcessHeap(), 0, declaration);
+}
+
 ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration)
 {
    ULONG refcount = InterlockedDecrement(&declaration->ref);
@@ -58,9 +66,9 @@ ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration 

    if (!refcount)
    {
-        HeapFree(GetProcessHeap(), 0, declaration->elements);
        declaration->parent_ops->wined3d_object_destroyed(declaration->parent);
-        HeapFree(GetProcessHeap(), 0, declaration);
+        wined3d_cs_emit_destroy_object(declaration->device->cs,
+                wined3d_vertex_declaration_destroy_object, declaration);
    }

    return refcount;