Stefan Dösinger : wined3d: Only use WINE_normalized_texrect if ARB_texture_np2 is supported.

Alexandre Julliard julliard at winehq.org
Wed Aug 5 09:47:47 CDT 2009


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Sun Aug  2 15:12:26 2009 +0200

wined3d: Only use WINE_normalized_texrect if ARB_texture_np2 is supported.

---

 dlls/wined3d/directx.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index fc8fa61..eb1cf66 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -715,9 +715,12 @@ static void quirk_ati_dx9(struct wined3d_gl_info *gl_info)
      * fglrx doesn't advertise GL_ARB_texture_non_power_of_two, but it advertises opengl 2.0 which
      * has this extension promoted to core. The extension loading code sets this extension supported
      * due to that, so this code works on fglrx as well. */
-    TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing.\n");
-    gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE;
-    gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE;
+    if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO])
+    {
+        TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing.\n");
+        gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE;
+        gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE;
+    }
 
     /* fglrx has the same structural issues as the one described in quirk_apple_glsl_constants, although
      * it is generally more efficient. Reserve just 8 constants. */




More information about the wine-cvs mailing list