ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_cleanup().

This commit is contained in:
Henri Verbeet 2010-12-15 21:06:25 +01:00 committed by Alexandre Julliard
parent 47fcc00cce
commit 2438968c34
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/basetexture.c
View File

@ -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)

2
dlls/wined3d/cubetexture.c
View File

@ -132,7 +132,7 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This)
IWineD3DSurface_Release((IWineD3DSurface *)surface);
}
}
basetexture_cleanup((IWineD3DBaseTexture *)This);
basetexture_cleanup((IWineD3DBaseTextureImpl *)This);
}
/* *******************************************

2
dlls/wined3d/texture.c
View File

@ -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);
}
/* *******************************************

2
dlls/wined3d/volumetexture.c
View File

@ -95,7 +95,7 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This)
IWineD3DVolume_Release((IWineD3DVolume *)volume);
}
}
basetexture_cleanup((IWineD3DBaseTexture *)This);
basetexture_cleanup((IWineD3DBaseTextureImpl *)This);
}
/* *******************************************

2
dlls/wined3d/wined3d_private.h
View File

@ -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;