[PATCH 2/4] wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_lod().
Henri Verbeet
hverbeet at codeweavers.com
Sun Jan 2 05:26:36 CST 2011
---
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, 7 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index d1d7f10..15a58fd 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -157,13 +157,11 @@ DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod)
return old;
}
-DWORD basetexture_get_lod(IWineD3DBaseTexture *iface)
+DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture)
{
- IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
-
- TRACE("(%p) : returning %d\n", This, This->baseTexture.LOD);
+ TRACE("texture %p, returning %u.\n", texture, texture->baseTexture.LOD);
- return This->baseTexture.LOD;
+ return texture->baseTexture.LOD;
}
DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture)
diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c
index f82b02e..ffd0da6 100644
--- a/dlls/wined3d/cubetexture.c
+++ b/dlls/wined3d/cubetexture.c
@@ -251,7 +251,7 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_SetLOD(IWineD3DCubeTexture *iface, D
}
static DWORD WINAPI IWineD3DCubeTextureImpl_GetLOD(IWineD3DCubeTexture *iface) {
- return basetexture_get_lod((IWineD3DBaseTexture *)iface);
+ return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface);
}
static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *iface)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 2bda3d6..6acd737 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -242,7 +242,7 @@ static DWORD WINAPI IWineD3DTextureImpl_SetLOD(IWineD3DTexture *iface, DWORD LOD
}
static DWORD WINAPI IWineD3DTextureImpl_GetLOD(IWineD3DTexture *iface) {
- return basetexture_get_lod((IWineD3DBaseTexture *)iface);
+ return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface);
}
static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface)
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index 7ec81f1..7606e99 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -206,7 +206,7 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_SetLOD(IWineD3DVolumeTexture *ifac
}
static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLOD(IWineD3DVolumeTexture *iface) {
- return basetexture_get_lod((IWineD3DBaseTexture *)iface);
+ return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface);
}
static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTexture *iface)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 49c1f6f..af542d4 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1917,7 +1917,7 @@ 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(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;
-DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
+DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;
IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture,
UINT sub_resource_idx) DECLSPEC_HIDDEN;
HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UINT level_count,
--
1.7.2.2
More information about the wine-patches
mailing list