Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_level_count().
Alexandre Julliard
julliard at winehq.org
Fri Dec 17 11:30:41 CST 2010
Module: wine
Branch: master
Commit: f5d96d1701daa051e9c32ac3df557cf7463b8247
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d96d1701daa051e9c32ac3df557cf7463b8247
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Dec 15 21:06:26 2010 +0100
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_level_count().
---
dlls/wined3d/basetexture.c | 7 +++----
dlls/wined3d/cubetexture.c | 5 +++--
dlls/wined3d/texture.c | 5 +++--
dlls/wined3d/volumetexture.c | 5 +++--
dlls/wined3d/wined3d_private.h | 2 +-
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index 6db8a5d..cd1b687 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -167,11 +167,10 @@ DWORD basetexture_get_lod(IWineD3DBaseTexture *iface)
return This->baseTexture.LOD;
}
-DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface)
+DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture)
{
- IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
- TRACE("iface %p, returning %u.\n", iface, This->baseTexture.level_count);
- return This->baseTexture.level_count;
+ TRACE("texture %p, returning %u.\n", texture, texture->baseTexture.level_count);
+ return texture->baseTexture.level_count;
}
HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType)
diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c
index eb92729..da39701 100644
--- a/dlls/wined3d/cubetexture.c
+++ b/dlls/wined3d/cubetexture.c
@@ -254,8 +254,9 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_GetLOD(IWineD3DCubeTexture *iface) {
return basetexture_get_lod((IWineD3DBaseTexture *)iface);
}
-static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *iface) {
- return basetexture_get_level_count((IWineD3DBaseTexture *)iface);
+static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *iface)
+{
+ return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface);
}
static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) {
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index b8b3867..d3a757f 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -245,8 +245,9 @@ static DWORD WINAPI IWineD3DTextureImpl_GetLOD(IWineD3DTexture *iface) {
return basetexture_get_lod((IWineD3DBaseTexture *)iface);
}
-static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface) {
- return basetexture_get_level_count((IWineD3DBaseTexture *)iface);
+static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface)
+{
+ return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface);
}
static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) {
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index dde1f4c..b2a6102 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -209,8 +209,9 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLOD(IWineD3DVolumeTexture *ifac
return basetexture_get_lod((IWineD3DBaseTexture *)iface);
}
-static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTexture *iface) {
- return basetexture_get_level_count((IWineD3DBaseTexture *)iface);
+static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTexture *iface)
+{
+ return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface);
}
static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVolumeTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c63c24e..e73776e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1916,7 +1916,7 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac
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;
+DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;
DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture,
UINT sub_resource_idx) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list