Matteo Bruni : wined3d: Don' t hardcode WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL cap flag.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 13ceb3fddc21b57cdd35fe821644c05aad71e737
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=13ceb3fddc21b57cdd35fe8216...

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Thu Jul  2 17:41:35 2015 +0200

wined3d: Don't hardcode WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL cap flag.

---

 dlls/wined3d/directx.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 243f5ae..e21f52f 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4882,8 +4882,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
 
     if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO])
     {
-        caps->TextureCaps  |= WINED3DPTEXTURECAPS_POW2 |
-                              WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL;
+        caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2;
+        if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE])
+            caps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL;
     }
 
     if (gl_info->supported[EXT_TEXTURE3D])