fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

glx: add a few missing glXChooseFBConfig() attributes

Browse source 
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38842

NOTE: This is a candidate for the 7.11 branch.
This commit is contained in:
Brian Paul 2011-07-11 08:00:59 -06:00
parent bb0d5cae00
commit d60880db35
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/state_trackers/glx/xlib/glx_api.c
View file

@ -864,16 +864,19 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig )
parselist++; parselist++;
break; break;
case GLX_FBCONFIG_ID: case GLX_FBCONFIG_ID:
case GLX_VISUAL_ID:
if (!fbConfig) if (!fbConfig)
return NULL; return NULL;
parselist++; parselist++;
desiredVisualID = *parselist++; desiredVisualID = *parselist++;
break; break;
case GLX_X_RENDERABLE: case GLX_X_RENDERABLE:
case GLX_MAX_PBUFFER_WIDTH:
case GLX_MAX_PBUFFER_HEIGHT:
case GLX_MAX_PBUFFER_PIXELS:
if (!fbConfig) if (!fbConfig)
return NULL; return NULL; /* invalid config option */
parselist += 2; parselist += 2; /* ignore the parameter */
/* ignore */
break; break;
#ifdef GLX_EXT_texture_from_pixmap #ifdef GLX_EXT_texture_from_pixmap

4
src/mesa/drivers/x11/fakeglx.c
View file

@ -1097,12 +1097,16 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig )
parselist++; parselist++;
break; break;
case GLX_FBCONFIG_ID: case GLX_FBCONFIG_ID:
case GLX_VISUAL_ID:
if (!fbConfig) if (!fbConfig)
return NULL; return NULL;
parselist++; parselist++;
desiredVisualID = *parselist++; desiredVisualID = *parselist++;
break; break;
case GLX_X_RENDERABLE: case GLX_X_RENDERABLE:
case GLX_MAX_PBUFFER_WIDTH:
case GLX_MAX_PBUFFER_HEIGHT:
case GLX_MAX_PBUFFER_PIXELS:
if (!fbConfig) if (!fbConfig)
return NULL; return NULL;
parselist += 2; parselist += 2;