Henri Verbeet : wined3d: Don' t bother downloading buffer contents on destruction.

Alexandre Julliard julliard at winehq.org
Thu Aug 15 13:12:46 CDT 2013


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Aug 13 08:51:44 2013 +0200

wined3d: Don't bother downloading buffer contents on destruction.

---

 dlls/wined3d/buffer.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 586b16c..3f692e2 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -551,12 +551,21 @@ static void buffer_unload(struct wined3d_resource *resource)
 ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer)
 {
     ULONG refcount = InterlockedDecrement(&buffer->resource.ref);
+    struct wined3d_context *context;
 
     TRACE("%p decreasing refcount to %u.\n", buffer, refcount);
 
     if (!refcount)
     {
-        buffer_unload(&buffer->resource);
+        if (buffer->buffer_object)
+        {
+            context = context_acquire(buffer->resource.device, NULL);
+            delete_gl_buffer(buffer, context->gl_info);
+            context_release(context);
+
+            HeapFree(GetProcessHeap(), 0, buffer->conversion_map);
+        }
+
         resource_cleanup(&buffer->resource);
         buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent);
         HeapFree(GetProcessHeap(), 0, buffer->maps);




More information about the wine-cvs mailing list