[cairo-commit] glitz/src/glx glitz_glx_extension.c,1.3,1.4

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz/src/glx
In directory gabe:/tmp/cvs-serv8819/src/glx

Modified Files:
	glitz_glx_extension.c 
Log Message:
fglrx hack and some missing ChangeLog entries

Index: glitz_glx_extension.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glx_extension.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- glitz_glx_extension.c	14 Sep 2005 15:57:16 -0000	1.3
+++ glitz_glx_extension.c	10 Feb 2006 09:04:32 -0000	1.4
@@ -44,6 +44,7 @@
 			    glitz_gl_float_t        glx_version)
 {
     const char *glx_extensions_string;
+    const char *vendor;
 
     glx_extensions_string =
 	glXQueryExtensionsString (screen_info->display_info->display,
@@ -54,18 +55,24 @@
 				glx_extensions_string,
 				glx_extensions);
 
-    if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_MULTISAMPLE_MASK) {
-	const char *vendor;
-
-	vendor = glXGetClientString (screen_info->display_info->display,
-				     GLX_VENDOR);
-
-	if (vendor) {
+    vendor = glXGetClientString (screen_info->display_info->display,
+				 GLX_VENDOR);
 
+    if (vendor)
+    {
+	if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_MULTISAMPLE_MASK)
+	{
 	    /* NVIDIA's driver seem to support multisample with pbuffers */
 	    if (!strncmp ("NVIDIA", vendor, 6))
 		screen_info->glx_feature_mask |=
 		    GLITZ_GLX_FEATURE_PBUFFER_MULTISAMPLE_MASK;
 	}
+
+	if (screen_info->glx_version < 1.3f)
+	{
+	    /* ATI's driver emulates GLX 1.3 support */
+	    if (!strncmp ("ATI", vendor, 3))
+		screen_info->glx_version = 1.3f;
+	}
     }
 }