Stefan Dösinger : wined3d: Don' t set cube and volume POW2 caps if np2 textures are supported.
Alexandre Julliard
julliard at winehq.org
Mon Jan 17 10:59:50 CST 2011
Module: wine
Branch: master
Commit: e98a0e5bb1d1d3cdd2ab76313726d2567f8a79b3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98a0e5bb1d1d3cdd2ab76313726d2567f8a79b3
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sun Nov 21 18:08:41 2010 +0100
wined3d: Don't set cube and volume POW2 caps if np2 textures are supported.
---
dlls/wined3d/directx.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index da179a7..e39bd3a 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4343,16 +4343,21 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
if (gl_info->supported[EXT_TEXTURE3D])
{
pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP |
- WINED3DPTEXTURECAPS_MIPVOLUMEMAP |
- WINED3DPTEXTURECAPS_VOLUMEMAP_POW2;
+ WINED3DPTEXTURECAPS_MIPVOLUMEMAP;
+ if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO])
+ {
+ pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2;
+ }
}
if (gl_info->supported[ARB_TEXTURE_CUBE_MAP])
{
pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP |
- WINED3DPTEXTURECAPS_MIPCUBEMAP |
- WINED3DPTEXTURECAPS_CUBEMAP_POW2;
-
+ WINED3DPTEXTURECAPS_MIPCUBEMAP;
+ if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO])
+ {
+ pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2;
+ }
}
pCaps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR |
More information about the wine-cvs
mailing list