From: Stefan Dösinger <stefan@codeweavers.com>
Date: Mon, 28 Sep 2009 10:24:00 +0000 (+0200)
Subject: wined3d: Don't use GL_NV_texture_shader on OSX.
X-Git-Tag: wine-1.1.31~500
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=77a83aee793b7441c6842347a5451765c79334be;p=wine%2Feterwine.git

wined3d: Don't use GL_NV_texture_shader on OSX.
---

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index de9b6fb644..eeb28e6c12 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -666,6 +666,12 @@ static BOOL match_allows_spec_alpha(const struct wined3d_gl_info *gl_info, const
     }
 }
 
+static BOOL match_apple_nvts(const struct wined3d_gl_info *gl_info, const char *gl_renderer)
+{
+    if(!match_apple(gl_info, gl_renderer)) return FALSE;
+    return GL_SUPPORT(NV_TEXTURE_SHADER);
+}
+
 static void quirk_arb_constants(struct wined3d_gl_info *gl_info)
 {
     TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->vs_arb_constantsF);
@@ -783,6 +789,13 @@ static void quirk_allows_specular_alpha(struct wined3d_gl_info *gl_info)
     gl_info->quirks |= WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA;
 }
 
+static void quirk_apple_nvts(struct wined3d_gl_info *gl_info)
+{
+    gl_info->supported[NV_TEXTURE_SHADER] = FALSE;
+    gl_info->supported[NV_TEXTURE_SHADER2] = FALSE;
+    gl_info->supported[NV_TEXTURE_SHADER3] = FALSE;
+}
+
 struct driver_quirk
 {
     BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer);
@@ -847,7 +860,15 @@ static const struct driver_quirk quirk_table[] =
         match_allows_spec_alpha,
         quirk_allows_specular_alpha,
         "Allow specular alpha quirk"
-    }
+    },
+    {
+        /* The pixel formats provided by GL_NV_texture_shader are broken on OSX
+         * (rdar://5682521).
+         */
+        match_apple_nvts,
+        quirk_apple_nvts,
+        "Apple NV_texture_shader disable"
+    },
 };
 
 /* Certain applications (Steam) complain if we report an outdated driver version. In general,