diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-08-22 14:28:19 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-08-22 14:28:19 +0000 |
| commit | dfb6c56ed85d7b11b6e7e9b0a5ec7eddb1162510 (patch) | |
| tree | 14139bf28b8b19ca67f88e3934abce9045eee31f | |
| parent | dcf14aa3a79a3165f53fb09f9f9bb45b5e6052a4 (diff) | |
added GL_X_RENDERABLE to glXChooseFBConfig (bug 4181)
| -rw-r--r-- | src/mesa/drivers/x11/fakeglx.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index ca3b693706..2cce27d21c 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.3 + * Version: 6.4 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * @@ -1092,6 +1092,8 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig ) * FBConfig attribs. */ case GLX_RENDER_TYPE: + if (!fbConfig) + return NULL; parselist++; if (*parselist == GLX_RGBA_BIT) { rgb_flag = GL_TRUE; @@ -1105,6 +1107,8 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig ) parselist++; break; case GLX_DRAWABLE_TYPE: + if (!fbConfig) + return NULL; parselist++; if (*parselist & ~(GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT)) { return NULL; /* bad bit */ @@ -1112,8 +1116,16 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig ) parselist++; break; case GLX_FBCONFIG_ID: + if (!fbConfig) + return NULL; parselist++; - desiredVisualID = *parselist; + desiredVisualID = *parselist++; + break; + case GLX_X_RENDERABLE: + if (!fbConfig) + return NULL; + parselist += 2; + /* ignore */ break; case None: |