diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 6233fb8..30d8fd0 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -875,6 +875,19 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig )
             parselist += 2;
             /* ignore */
             break;
+         case GLX_MAX_PBUFFER_WIDTH:
+         case GLX_MAX_PBUFFER_HEIGHT:
+         case GLX_MAX_PBUFFER_PIXELS:
+            if (!fbConfig)
+               return NULL; /* invalid config option */
+            parselist += 2; /* ignore the parameter */
+            break;
+         case GLX_VISUAL_ID:
+            if (!fbConfig)
+               return NULL; /* invalid config option */
+            parselist++;
+            desiredVisualID = *parselist++;
+            break;
 
 #ifdef GLX_EXT_texture_from_pixmap
          case GLX_BIND_TO_TEXTURE_RGB_EXT:
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 48657b4..8685805 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1108,6 +1108,15 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig )
             parselist += 2;
             /* ignore */
             break;
+         case GLX_MAX_PBUFFER_WIDTH:
+         case GLX_MAX_PBUFFER_HEIGHT:
+         case GLX_MAX_PBUFFER_PIXELS:
+         case GLX_VISUAL_ID:
+            if (!fbConfig)
+               return NULL; /* invalid config option */
+            parselist++;
+            desiredVisualID = *parselist++;
+            break;
 
 #ifdef GLX_EXT_texture_from_pixmap
          case GLX_BIND_TO_TEXTURE_RGB_EXT: