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

wined3d: Get rid of IWineD3DBaseTexture::IsCondNP2().

This commit is contained in:
Henri Verbeet 2011-03-16 18:58:03 +01:00 committed by Alexandre Julliard
parent 2d4bce87ba
commit 09b4ed2e75
5 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/basetexture.c
View File

@ -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;

8
dlls/wined3d/cubetexture.c
View File

@ -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,
};

11
dlls/wined3d/texture.c
View File

@ -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,
};

8
dlls/wined3d/volumetexture.c
View File

@ -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,
};

2
include/wine/wined3d.idl
View File

@ -2356,8 +2356,6 @@ interface IWineD3DBaseTexture : IWineD3DResource
);
void GenerateMipSubLevels(
);
BOOL IsCondNP2(
);
struct wined3d_resource *GetSubResource(
[in] UINT sub_resource_idx
);