wined3d: Don't set cube and volume POW2 caps if np2 textures are supported.

This commit is contained in:
Stefan Dösinger 2010-11-21 18:08:41 +01:00 committed by Alexandre Julliard
parent 31c23ad9b5
commit e98a0e5bb1
1 changed files with 10 additions and 5 deletions

View File

@ -4343,16 +4343,21 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
if (gl_info->supported[EXT_TEXTURE3D]) if (gl_info->supported[EXT_TEXTURE3D])
{ {
pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP |
WINED3DPTEXTURECAPS_MIPVOLUMEMAP | WINED3DPTEXTURECAPS_MIPVOLUMEMAP;
WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO])
{
pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2;
}
} }
if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) if (gl_info->supported[ARB_TEXTURE_CUBE_MAP])
{ {
pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP |
WINED3DPTEXTURECAPS_MIPCUBEMAP | WINED3DPTEXTURECAPS_MIPCUBEMAP;
WINED3DPTEXTURECAPS_CUBEMAP_POW2; if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO])
{
pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2;
}
} }
pCaps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | pCaps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR |