[10/20] WineD3D: Do not keep internal references on vertex shaders

Stefan Dösinger stefan at codeweavers.com
Sat Jan 6 11:25:19 CST 2007


-------------- next part --------------
From 3dd5efd0729b954cdef0b22fe9afe74887ef5710 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Sat, 6 Jan 2007 16:46:58 +0100
Subject: [PATCH] WineD3D: Do not keep internal references on vertex shaders

---
 dlls/wined3d/device.c     |    7 -------
 dlls/wined3d/stateblock.c |   11 -----------
 2 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 8354114..acc3bbb 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3270,13 +3270,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl
         return WINED3D_OK;
     }
 
-    if (NULL != pShader) {
-        IWineD3DVertexShader_AddRef(pShader);
-    }
-    if (NULL != oldShader) {
-        IWineD3DVertexShader_Release(oldShader);
-    }
-
     TRACE("(%p) : setting pShader(%p)\n", This, pShader);
 
     IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VSHADER);
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index ca28027..5e36c5d 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -250,10 +250,6 @@ static ULONG  WINAPI IWineD3DStateBlockI
                 IWineD3DPixelShader_Release(This->pixelShader);
             }
 
-            if (NULL != This->vertexShader) {
-                IWineD3DVertexShader_Release(This->vertexShader);
-            }
-
             /* NOTE: according to MSDN: The application is responsible for making sure the texture references are cleared down */
             for (counter = 0; counter < GL_LIMITS(sampler_stages); counter++) {
                 if (This->textures[counter]) {
@@ -337,13 +333,6 @@ static HRESULT  WINAPI IWineD3DStateBloc
         if (This->vertexShader != targetStateBlock->vertexShader) {
             TRACE("Updating vertex shader from %p to %p\n", This->vertexShader, targetStateBlock->vertexShader);
 
-            if (targetStateBlock->vertexShader) {
-                IWineD3DVertexShader_AddRef(targetStateBlock->vertexShader);
-            }
-            if (This->vertexShader) {
-                IWineD3DVertexShader_Release(This->vertexShader);
-            }
-
             This->vertexShader = targetStateBlock->vertexShader;
         }
 
-- 
1.4.2.4



More information about the wine-patches mailing list