Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_cleanup().
Module: wine Branch: master Commit: 2438968c34f2e01bd720c64002d43f16c02eecc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2438968c34f2e01bd720c64002...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Dec 15 21:06:25 2010 +0100
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_cleanup().
---
dlls/wined3d/basetexture.c | 8 ++++---- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index b48aaf3..6db8a5d 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -74,11 +74,11 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN return WINED3D_OK; }
-void basetexture_cleanup(IWineD3DBaseTexture *iface) +void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) { - basetexture_unload((IWineD3DBaseTextureImpl *)iface); - HeapFree(GetProcessHeap(), 0, ((IWineD3DBaseTextureImpl *)iface)->baseTexture.sub_resources); - resource_cleanup((IWineD3DResource *)iface); + basetexture_unload(texture); + HeapFree(GetProcessHeap(), 0, texture->baseTexture.sub_resources); + resource_cleanup((IWineD3DResource *)texture); }
IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 66df6ba..eb92729 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -132,7 +132,7 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) IWineD3DSurface_Release((IWineD3DSurface *)surface); } } - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); }
/* ******************************************* diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 86dd01a..b8b3867 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -126,7 +126,7 @@ static void texture_cleanup(IWineD3DTextureImpl *This) }
TRACE("(%p) : Cleaning up base texture\n", This); - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); }
/* ******************************************* diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index ae819fe..dde1f4c 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -95,7 +95,7 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) IWineD3DVolume_Release((IWineD3DVolume *)volume); } } - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); }
/* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a15f38..c63c24e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1913,7 +1913,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; -void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
-
Alexandre Julliard