Module: wine Branch: master Commit: bf108ac8723d69364f668b7f6d107adb353ac641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf108ac8723d69364f668b7f6d...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Jan 3 18:51:38 2011 +0100
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_generate_mipmaps().
---
dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 0c3a67a..608efc9 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -225,10 +225,10 @@ WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture return texture->baseTexture.filterType; }
-void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) +void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture) { /* TODO: Implement filters using GL_SGI_generate_mipmaps. */ - FIXME("iface %p stub!\n", iface); + FIXME("texture %p stub!\n", texture); }
BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 8ef8320..e3a0583 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -270,8 +270,9 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterT return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); }
-static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) { - basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); +static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) +{ + basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); }
/* Context activation is done by the caller. */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a4b7b36..232f105 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -261,8 +261,9 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType( return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); }
-static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) { - basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); +static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) +{ + basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); }
/* Context activation is done by the caller. */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 3d02895..b2ddce1 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -225,8 +225,9 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilte return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); }
-static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) { - basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); +static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) +{ + basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); }
/* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23d1fd1..e22cc9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1914,7 +1914,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, 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(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; -void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;