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

wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_autogen_filter_type().

This commit is contained in:
Henri Verbeet 2011-01-02 12:26:38 +01:00 committed by Alexandre Julliard
parent 568f9ecb22
commit 9de4433dbe
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/basetexture.c
View File

@ -218,13 +218,11 @@ HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WI
return WINED3D_OK; return WINED3D_OK;
} }
WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture)
{ {
IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; TRACE("texture %p.\n", texture);
FIXME("(%p) : stub\n", This); return texture->baseTexture.filterType;
return This->baseTexture.filterType;
} }
void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface)

5
dlls/wined3d/cubetexture.c
View File

@ -265,8 +265,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeT
return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType);
} }
static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterType(IWineD3DCubeTexture *iface) { static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterType(IWineD3DCubeTexture *iface)
return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); {
return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface);
} }
static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) { static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) {

5
dlls/wined3d/texture.c
View File

@ -256,8 +256,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture *
return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType);
} }
static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType(IWineD3DTexture *iface) { static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType(IWineD3DTexture *iface)
return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); {
return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface);
} }
static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) { static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) {

5
dlls/wined3d/volumetexture.c
View File

@ -220,8 +220,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVol
return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType);
} }
static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilterType(IWineD3DVolumeTexture *iface) { static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilterType(IWineD3DVolumeTexture *iface)
return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); {
return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface);
} }
static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) { static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) {

2
dlls/wined3d/wined3d_private.h
View File

@ -1915,7 +1915,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN;
void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;
void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;
DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;
DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;
IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture,