Jan Sikorski : d3d9: Don't grab wined3d lock in index/vertexbuffer AddRef/Release().
Alexandre Julliard
julliard at winehq.org
Mon Nov 1 16:38:02 CDT 2021
Module: wine
Branch: master
Commit: 6b866b93e0fe528eef13f2d1937f3fa66790ec34
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b866b93e0fe528eef13f2d1937f3fa66790ec34
Author: Jan Sikorski <jsikorski at codeweavers.com>
Date: Fri Oct 15 14:26:29 2021 +0200
d3d9: Don't grab wined3d lock in index/vertexbuffer AddRef/Release().
Signed-off-by: Jan Sikorski <jsikorski at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/buffer.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c
index 901557c288f..bcb97011fe5 100644
--- a/dlls/d3d9/buffer.c
+++ b/dlls/d3d9/buffer.c
@@ -56,12 +56,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface)
if (refcount == 1)
{
IDirect3DDevice9Ex_AddRef(buffer->parent_device);
- wined3d_mutex_lock();
if (buffer->draw_buffer)
wined3d_buffer_incref(buffer->draw_buffer);
else
wined3d_buffer_incref(buffer->wined3d_buffer);
- wined3d_mutex_unlock();
}
return refcount;
@@ -79,12 +77,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface)
struct wined3d_buffer *draw_buffer = buffer->draw_buffer;
IDirect3DDevice9Ex *device = buffer->parent_device;
- wined3d_mutex_lock();
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. */
IDirect3DDevice9Ex_Release(device);
@@ -388,12 +384,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface)
if (refcount == 1)
{
IDirect3DDevice9Ex_AddRef(buffer->parent_device);
- wined3d_mutex_lock();
if (buffer->draw_buffer)
wined3d_buffer_incref(buffer->draw_buffer);
else
wined3d_buffer_incref(buffer->wined3d_buffer);
- wined3d_mutex_unlock();
}
return refcount;
@@ -411,12 +405,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface)
struct wined3d_buffer *draw_buffer = buffer->draw_buffer;
IDirect3DDevice9Ex *device = buffer->parent_device;
- wined3d_mutex_lock();
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. */
IDirect3DDevice9Ex_Release(device);
More information about the wine-cvs
mailing list