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

[David Reveman]

Committed by: davidr

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

Modified Files:
	glitz_glx_extension.c 
Log Message:
fbconfigs and pbuffers if GLX 1.3

Index: glitz_glx_extension.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glx_extension.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- glitz_glx_extension.c	10 Feb 2006 09:04:32 -0000	1.4
+++ glitz_glx_extension.c	14 Feb 2006 14:23:47 -0000	1.5
@@ -31,8 +31,8 @@
 
 static glitz_extension_map glx_extensions[] = {
     { 0.0, "GLX_EXT_visual_rating", GLITZ_GLX_FEATURE_VISUAL_RATING_MASK },
-    { 0.0, "GLX_SGIX_fbconfig", GLITZ_GLX_FEATURE_FBCONFIG_MASK },
-    { 0.0, "GLX_SGIX_pbuffer", GLITZ_GLX_FEATURE_PBUFFER_MASK },
+    { 1.3, "GLX_SGIX_fbconfig", GLITZ_GLX_FEATURE_FBCONFIG_MASK },
+    { 1.3, "GLX_SGIX_pbuffer", GLITZ_GLX_FEATURE_PBUFFER_MASK },
     { 0.0, "GLX_SGI_make_current_read",
       GLITZ_GLX_FEATURE_MAKE_CURRENT_READ_MASK },
     { 0.0, "GLX_ARB_multisample", GLITZ_GLX_FEATURE_MULTISAMPLE_MASK },
@@ -50,14 +50,24 @@
 	glXQueryExtensionsString (screen_info->display_info->display,
 				  screen_info->screen);
 
+    vendor = glXGetClientString (screen_info->display_info->display,
+				 GLX_VENDOR);
+
+    if (vendor)
+    {
+	if (glx_version < 1.3f)
+	{
+	    /* ATI's driver emulates GLX 1.3 support */
+	    if (!strncmp ("ATI", vendor, 3))
+		screen_info->glx_version = glx_version = 1.3f;
+	}
+    }
+
     screen_info->glx_feature_mask =
 	glitz_extensions_query (glx_version,
 				glx_extensions_string,
 				glx_extensions);
 
-    vendor = glXGetClientString (screen_info->display_info->display,
-				 GLX_VENDOR);
-
     if (vendor)
     {
 	if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_MULTISAMPLE_MASK)
@@ -67,12 +77,5 @@
 		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;
-	}
     }
 }