Henri Verbeet : wined3d: Don' t bother unsetting texture resources in IWineD3DDeviceImpl_Uninit3D().

Alexandre Julliard julliard at winehq.org
Tue Apr 19 12:08:17 CDT 2011


Module: wine
Branch: master
Commit: e30a05748722c0d9d8dc1bd0c6a2e70781463a46
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e30a05748722c0d9d8dc1bd0c6a2e70781463a46

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Apr 19 00:07:58 2011 +0200

wined3d: Don't bother unsetting texture resources in IWineD3DDeviceImpl_Uninit3D().

Releasing the stateblock already takes care of this.

---

 dlls/wined3d/device.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 3c1ac76..8c443fe 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2136,7 +2136,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface)
     const struct wined3d_gl_info *gl_info;
     struct IWineD3DSurfaceImpl *surface;
     struct wined3d_context *context;
-    int sampler;
     UINT i;
     TRACE("(%p)\n", This);
 
@@ -2174,13 +2173,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface)
         This->cursorTexture = 0;
     }
 
-    for (sampler = 0; sampler < MAX_FRAGMENT_SAMPLERS; ++sampler) {
-        IWineD3DDevice_SetTexture(iface, sampler, NULL);
-    }
-    for (sampler = 0; sampler < MAX_VERTEX_SAMPLERS; ++sampler) {
-        IWineD3DDevice_SetTexture(iface, WINED3DVERTEXTEXTURESAMPLER0 + sampler, NULL);
-    }
-
     /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader
      * private data, it might contain opengl pointers
      */




More information about the wine-cvs mailing list