summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Reveman <davidr@novell.com>2006-02-10 09:04:31 +0000
committerDavid Reveman <davidr@novell.com>2006-02-10 09:04:31 +0000
commit6509fce99c29e73743a19713a97e0f1f24d8e479 (patch)
tree0ec041f9a0e0cfd7967e951b44cc3b3fee17a862 /src
parent9339da500d6d132fc4c7e06fbbc7f388c88d438e (diff)
fglrx hack and some missing ChangeLog entries
Diffstat (limited to 'src')
-rw-r--r--src/glx/glitz_glx_extension.c21
1 files changed, 14 insertions, 7 deletions
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;
+ }
}
}