[PATCH 3/4] wined3d: Get rid of IWineD3DBaseTexture::IsCondNP2().
Henri Verbeet
hverbeet at codeweavers.com
Wed Mar 16 12:58:03 CDT 2011
---
dlls/wined3d/basetexture.c | 2 +-
dlls/wined3d/cubetexture.c | 8 --------
dlls/wined3d/texture.c | 11 +----------
dlls/wined3d/volumetexture.c | 8 --------
include/wine/wined3d.idl | 2 --
5 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index 26e9a70..01652ab 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -371,7 +371,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTextureImpl *texture,
const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1],
const struct wined3d_gl_info *gl_info)
{
- BOOL cond_np2 = IWineD3DBaseTexture_IsCondNP2((IWineD3DBaseTexture *)texture);
+ BOOL cond_np2 = texture->baseTexture.cond_np2;
GLenum textureDimensions = texture->baseTexture.target;
DWORD state;
DWORD aniso;
diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c
index 9a27f5b..aed3674 100644
--- a/dlls/wined3d/cubetexture.c
+++ b/dlls/wined3d/cubetexture.c
@@ -319,13 +319,6 @@ static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeText
basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface);
}
-static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface)
-{
- TRACE("iface %p.\n", iface);
-
- return FALSE;
-}
-
static struct wined3d_resource * WINAPI IWineD3DCubeTextureImpl_GetSubResource(IWineD3DCubeTexture *iface,
UINT sub_resource_idx)
{
@@ -378,7 +371,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl =
IWineD3DCubeTextureImpl_SetAutoGenFilterType,
IWineD3DCubeTextureImpl_GetAutoGenFilterType,
IWineD3DCubeTextureImpl_GenerateMipSubLevels,
- IWineD3DCubeTextureImpl_IsCondNP2,
IWineD3DCubeTextureImpl_GetSubResource,
IWineD3DCubeTextureImpl_AddDirtyRegion,
};
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 4bc018c..3eb3c71 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -57,7 +57,7 @@ static HRESULT texture_bind(IWineD3DBaseTextureImpl *texture,
* state. The same applies to filtering. Even if the texture has only
* one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW
* fallback on macos. */
- if (IWineD3DBaseTexture_IsCondNP2((IWineD3DBaseTexture *)texture))
+ if (texture->baseTexture.cond_np2)
{
GLenum target = texture->baseTexture.target;
@@ -335,14 +335,6 @@ static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture
basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface);
}
-static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DBaseTexture *iface)
-{
- IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
- TRACE("(%p)\n", This);
-
- return This->baseTexture.cond_np2;
-}
-
static struct wined3d_resource * WINAPI IWineD3DTextureImpl_GetSubResource(IWineD3DBaseTexture *iface,
UINT sub_resource_idx)
{
@@ -395,7 +387,6 @@ static const IWineD3DBaseTextureVtbl IWineD3DTexture_Vtbl =
IWineD3DTextureImpl_SetAutoGenFilterType,
IWineD3DTextureImpl_GetAutoGenFilterType,
IWineD3DTextureImpl_GenerateMipSubLevels,
- IWineD3DTextureImpl_IsCondNP2,
IWineD3DTextureImpl_GetSubResource,
IWineD3DTextureImpl_AddDirtyRegion,
};
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index 07a83c3..3831ef1 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -252,13 +252,6 @@ static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DBaseTe
basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface);
}
-static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DBaseTexture *iface)
-{
- TRACE("iface %p.\n", iface);
-
- return FALSE;
-}
-
static struct wined3d_resource * WINAPI IWineD3DVolumeTextureImpl_GetSubResource(IWineD3DBaseTexture *iface,
UINT sub_resource_idx)
{
@@ -311,7 +304,6 @@ static const IWineD3DBaseTextureVtbl IWineD3DVolumeTexture_Vtbl =
IWineD3DVolumeTextureImpl_SetAutoGenFilterType,
IWineD3DVolumeTextureImpl_GetAutoGenFilterType,
IWineD3DVolumeTextureImpl_GenerateMipSubLevels,
- IWineD3DVolumeTextureImpl_IsCondNP2,
IWineD3DVolumeTextureImpl_GetSubResource,
IWineD3DVolumeTextureImpl_AddDirtyRegion,
};
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index b918240..50eba07 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2356,8 +2356,6 @@ interface IWineD3DBaseTexture : IWineD3DResource
);
void GenerateMipSubLevels(
);
- BOOL IsCondNP2(
- );
struct wined3d_resource *GetSubResource(
[in] UINT sub_resource_idx
);
--
1.7.3.4
More information about the wine-patches
mailing list