fglrx hack and some missing ChangeLog entries

2 files changed, 28 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index c27c692..c430fd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-02-10  David Reveman  <davidr@novell.com>
+
+	* src/glx/glitz_glx_extension.c (glitz_glx_query_extensions): 
+	Pretend we have GLX 1.3 if vendor is ATI.
+
+2006-02-06  David Reveman  <davidr@novell.com>
+
+	* src/glx/glitz_glx_drawable.c (glitz_glx_destroy): Indent fix.
+
+	* src/glitz_drawable.c (glitz_drawable_swap_buffer_region): Should be a
+	glFlush.
+
+	* src/glitz_context.c (glitz_context_draw_buffers): This looks better.
+
 2006-01-10  Vladimir Vukicevic  <vladimir@pobox.com>
 
 	* src/agl/glitz_wgl_format.c: Set GLITZ_FOURCC_RGB on all formats
diff --git a/src/glx/glitz_glx_extension.c b/src/glx/glitz_glx_extension.c
index 3953b34..3b7a2a6 100644
--- a/src/glx/glitz_glx_extension.c
+++ b/src/glx/glitz_glx_extension.c
@@ -44,6 +44,7 @@ glitz_glx_query_extensions (glitz_glx_screen_info_t *screen_info,
 			    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 @@ glitz_glx_query_extensions (glitz_glx_screen_info_t *screen_info,
 				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;
+	}
     }
 }