diff options
| author | David Reveman <davidr@novell.com> | 2006-02-14 14:23:44 +0000 |
|---|---|---|
| committer | David Reveman <davidr@novell.com> | 2006-02-14 14:23:44 +0000 |
| commit | 6788d948e3134754788f0cab52adfe3f5c44fd32 (patch) | |
| tree | c6f241519712f838a7883e4d78e44db0d7293970 | |
| parent | 6509fce99c29e73743a19713a97e0f1f24d8e479 (diff) | |
fbconfigs and pbuffers if GLX 1.3
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/glitz_buffer.c | 2 | ||||
| -rw-r--r-- | src/glx/glitz_glx_extension.c | 27 |
3 files changed, 22 insertions, 14 deletions
@@ -1,6 +1,11 @@ +2006-02-14 David Reveman <davidr@novell.com> + + * src/glx/glitz_glx_extension.c: GLX 1.3 or later includes fbconfig and + pbuffer support. + 2006-02-10 David Reveman <davidr@novell.com> - * src/glx/glitz_glx_extension.c (glitz_glx_query_extensions): + * 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> diff --git a/src/glitz_buffer.c b/src/glitz_buffer.c index bc47310..d2a64c0 100644 --- a/src/glitz_buffer.c +++ b/src/glitz_buffer.c @@ -177,7 +177,7 @@ glitz_pixel_buffer_create (glitz_drawable_t *drawable, } if (drawable->backend->feature_mask & - GLITZ_FEATURE_PIXEL_BUFFER_OBJECT_MASK) + GLITZ_FEATURE_PIXEL_BUFFER_OBJECT_MASK) status = _glitz_buffer_init (buffer, drawable, data, size, hint); else status = _glitz_buffer_init (buffer, NULL, data, size, hint); diff --git a/src/glx/glitz_glx_extension.c b/src/glx/glitz_glx_extension.c index 3b7a2a6..1442d61 100644 --- a/src/glx/glitz_glx_extension.c +++ b/src/glx/glitz_glx_extension.c @@ -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 @@ glitz_glx_query_extensions (glitz_glx_screen_info_t *screen_info, 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 @@ glitz_glx_query_extensions (glitz_glx_screen_info_t *screen_info, 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; - } } } |