Matteo Bruni : d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed.
Alexandre Julliard
julliard at winehq.org
Fri Aug 23 09:31:23 CDT 2019
Module: wine
Branch: stable
Commit: a7bbfcbe40625eb6f778c55029bf521c637f30c0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7bbfcbe40625eb6f778c55029bf521c637f30c0
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Wed Feb 27 18:30:08 2019 +0100
d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 7052e8e390b5998ff0c7870504dd499c59299f4b)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/d3d9/buffer.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c
index 840d7e9..0ea7b55 100644
--- a/dlls/d3d9/buffer.c
+++ b/dlls/d3d9/buffer.c
@@ -58,9 +58,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface)
{
IDirect3DDevice9Ex_AddRef(buffer->parent_device);
wined3d_mutex_lock();
- wined3d_buffer_incref(buffer->wined3d_buffer);
if (buffer->draw_buffer)
wined3d_buffer_incref(buffer->draw_buffer);
+ else
+ wined3d_buffer_incref(buffer->wined3d_buffer);
wined3d_mutex_unlock();
}
@@ -80,9 +81,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface)
IDirect3DDevice9Ex *device = buffer->parent_device;
wined3d_mutex_lock();
- wined3d_buffer_decref(buffer->wined3d_buffer);
if (draw_buffer)
wined3d_buffer_decref(draw_buffer);
+ else
+ wined3d_buffer_decref(buffer->wined3d_buffer);
wined3d_mutex_unlock();
/* Release the device last, as it may cause the device to be destroyed. */
@@ -267,6 +269,9 @@ static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl =
static void STDMETHODCALLTYPE d3d9_vertexbuffer_wined3d_object_destroyed(void *parent)
{
struct d3d9_vertexbuffer *buffer = parent;
+
+ if (buffer->draw_buffer)
+ wined3d_buffer_decref(buffer->wined3d_buffer);
d3d9_resource_cleanup(&buffer->resource);
heap_free(buffer);
}
@@ -384,9 +389,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface)
{
IDirect3DDevice9Ex_AddRef(buffer->parent_device);
wined3d_mutex_lock();
- wined3d_buffer_incref(buffer->wined3d_buffer);
if (buffer->draw_buffer)
wined3d_buffer_incref(buffer->draw_buffer);
+ else
+ wined3d_buffer_incref(buffer->wined3d_buffer);
wined3d_mutex_unlock();
}
@@ -406,9 +412,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface)
IDirect3DDevice9Ex *device = buffer->parent_device;
wined3d_mutex_lock();
- wined3d_buffer_decref(buffer->wined3d_buffer);
if (draw_buffer)
wined3d_buffer_decref(draw_buffer);
+ else
+ wined3d_buffer_decref(buffer->wined3d_buffer);
wined3d_mutex_unlock();
/* Release the device last, as it may cause the device to be destroyed. */
@@ -591,6 +598,9 @@ static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl =
static void STDMETHODCALLTYPE d3d9_indexbuffer_wined3d_object_destroyed(void *parent)
{
struct d3d9_indexbuffer *buffer = parent;
+
+ if (buffer->draw_buffer)
+ wined3d_buffer_decref(buffer->wined3d_buffer);
d3d9_resource_cleanup(&buffer->resource);
heap_free(buffer);
}
More information about the wine-cvs
mailing list