diff options
| author | Brian Paul <brianp@vmware.com> | 2013-01-03 17:30:34 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-01-04 15:18:53 -0700 |
| commit | fe90762414ea3191143a82534e304871c1e311a8 (patch) | |
| tree | 972a737b78657daf90d9a02b7efa1e169acc0b95 /src/gallium/state_trackers/glx | |
| parent | aed37cbee8efb59b2f1a6bc69adcbaecd9e4fa13 (diff) | |
| download | external_mesa3d-fe90762414ea3191143a82534e304871c1e311a8.zip external_mesa3d-fe90762414ea3191143a82534e304871c1e311a8.tar.gz external_mesa3d-fe90762414ea3191143a82534e304871c1e311a8.tar.bz2 | |
st/glx: allow GLX_DONT_CARE for glXChooseFBConfig() attribute values
Fixes piglit glx-dont-care-mask test.
Note: This is a candidate for the stable branches.
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src/gallium/state_trackers/glx')
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/glx_api.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c index 8e3c6b8..20fae26 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_api.c +++ b/src/gallium/state_trackers/glx/xlib/glx_api.c @@ -687,6 +687,20 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig ) while (*parselist) { + if (fbConfig && + parselist[1] == GLX_DONT_CARE && + parselist[0] != GLX_LEVEL) { + /* For glXChooseFBConfig(), skip attributes whose value is + * GLX_DONT_CARE, unless it's GLX_LEVEL (which can legitimately be + * a negative value). + * + * From page 17 (23 of the pdf) of the GLX 1.4 spec: + * GLX DONT CARE may be specified for all attributes except GLX LEVEL. + */ + parselist += 2; + continue; + } + switch (*parselist) { case GLX_USE_GL: if (fbConfig) { |