[PATCH 3/5] wined3d: Remove some redundant code in IWineD3DVertexDeclarationImpl_Release().
Henri Verbeet
hverbeet at codeweavers.com
Mon Sep 28 03:05:01 CDT 2009
The situation the code tests for should never happen because either the
stateblock will still have a reference to the vertex declaration, or the
stateblock itself will be released.
---
dlls/wined3d/vertexdeclaration.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
index 18ea03a..6d617ed 100644
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -68,13 +68,8 @@ static ULONG WINAPI IWineD3DVertexDeclarationImpl_Release(IWineD3DVertexDeclarat
ULONG ref;
TRACE("(%p) : Releasing from %d\n", This, This->ref);
ref = InterlockedDecrement(&This->ref);
- if (ref == 0) {
- if (This->wineD3DDevice->stateBlock && iface == This->wineD3DDevice->stateBlock->vertexDecl)
- {
- /* See comment in PixelShader::Release */
- IWineD3DDeviceImpl_MarkStateDirty(This->wineD3DDevice, STATE_VDECL);
- }
-
+ if (!ref)
+ {
HeapFree(GetProcessHeap(), 0, This->elements);
This->parent_ops->wined3d_object_destroyed(This->parent);
HeapFree(GetProcessHeap(), 0, This);
--
1.6.0.6
More information about the wine-patches
mailing list