Jan Sikorski : d3d8: Don't grab wined3d lock in vertex/indexbuffer AddRef/Release().
Alexandre Julliard
julliard at winehq.org
Tue Oct 19 16:07:49 CDT 2021
Module: wine
Branch: master
Commit: 0ceabaae80afb9b9d4bc21897604acf5c3839ec3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ceabaae80afb9b9d4bc21897604acf5c3839ec3
Author: Jan Sikorski <jsikorski at codeweavers.com>
Date: Fri Oct 15 14:26:24 2021 +0200
d3d8: Don't grab wined3d lock in vertex/indexbuffer 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/d3d8/buffer.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c
index 6ab21512472..0692dbde6e7 100644
--- a/dlls/d3d8/buffer.c
+++ b/dlls/d3d8/buffer.c
@@ -54,12 +54,10 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface)
if (refcount == 1)
{
IDirect3DDevice8_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;
@@ -77,12 +75,10 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface)
struct wined3d_buffer *draw_buffer = buffer->draw_buffer;
IDirect3DDevice8 *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. */
IDirect3DDevice8_Release(device);
@@ -381,12 +377,10 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface)
if (refcount == 1)
{
IDirect3DDevice8_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;
@@ -404,12 +398,10 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface)
struct wined3d_buffer *draw_buffer = buffer->draw_buffer;
IDirect3DDevice8 *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. */
IDirect3DDevice8_Release(device);
More information about the wine-cvs
mailing list