diff options
| author | Brian Paul <[email protected]> | 2009-10-05 14:42:08 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-10-05 14:42:08 -0600 |
| commit | 55770d09c18c4d33403abb97dfef4f897efbbe2a (patch) | |
| tree | 3f3cb2ea42c511c11e134c2d414367df82268cea /src/mesa/drivers/x11 | |
| parent | f00da2a3ff59c1a7104ac25a1c6eba5a6050ad68 (diff) | |
| parent | 79892e7976fbb91ae426f5868d5f453e977c1f17 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
Diffstat (limited to 'src/mesa/drivers/x11')
| -rw-r--r-- | src/mesa/drivers/x11/fakeglx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index eb7c4f6417c..6449dc88b0d 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -1197,10 +1197,10 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig ) if (!fbConfig) return NULL; parselist++; - if (*parselist == GLX_RGBA_BIT) { + if (*parselist & GLX_RGBA_BIT) { rgb_flag = GL_TRUE; } - else if (*parselist == GLX_COLOR_INDEX_BIT) { + else if (*parselist & GLX_COLOR_INDEX_BIT) { rgb_flag = GL_FALSE; } else if (*parselist == 0) { |