diff options
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/x11/fakeglx.c | 14 | ||||
-rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 12 | ||||
-rw-r--r-- | src/mesa/drivers/x11/glxapi.h | 5 |
3 files changed, 25 insertions, 6 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index 08a931a182..a402521e31 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -1,4 +1,4 @@ -/* $Id: fakeglx.c,v 1.31 2000/04/05 22:09:58 brianp Exp $ */ +/* $Id: fakeglx.c,v 1.32 2000/04/10 21:13:19 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1629,7 +1629,7 @@ Fake_glXGetClientString( Display *dpy, int name ) * GLX 1.3 and later */ -static GLXFBConfig +static GLXFBConfig * Fake_glXChooseFBConfig( Display *dpy, int screen, const int *attribList, int *nitems ) { @@ -1653,6 +1653,16 @@ Fake_glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config, } +static GLXFBConfig * +Fake_glXGetFBConfigs( Display *dpy, int screen, int *nelements ) +{ + (void) dpy; + (void) screen; + (void) nelements; + return 0; +} + + static XVisualInfo * Fake_glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config ) { diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index ffdfe65ac0..93e5808ddb 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -1,4 +1,4 @@ -/* $Id: glxapi.c,v 1.15 2000/02/27 18:26:54 brianp Exp $ */ +/* $Id: glxapi.c,v 1.16 2000/04/10 21:13:19 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -359,7 +359,7 @@ Display *glXGetCurrentDisplay(void) #ifdef _GLXAPI_VERSION_1_3 -GLXFBConfig glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems) +GLXFBConfig *glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems) { struct _glxapi_table *t = get_dispatch(dpy); if (!t) @@ -446,6 +446,14 @@ int glXGetFBConfigAttrib(Display *dpy, GLXFBConfig config, int attribute, int *v } +GLXFBConfig *glXGetFBConfigs(Display *dpy, int screen, int *nelements) +{ + struct _glxapi_table *t = get_dispatch(dpy); + if (!t) + return 0; + return (t->GetFBConfigs)(dpy, screen, nelements); +} + void glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask) { struct _glxapi_table *t = get_dispatch(dpy); diff --git a/src/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h index 27d62d8fae..b669cfc08b 100644 --- a/src/mesa/drivers/x11/glxapi.h +++ b/src/mesa/drivers/x11/glxapi.h @@ -1,4 +1,4 @@ -/* $Id: glxapi.h,v 1.4 2000/02/27 18:26:54 brianp Exp $ */ +/* $Id: glxapi.h,v 1.5 2000/04/10 21:13:19 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -84,7 +84,7 @@ struct _glxapi_table { #endif #ifdef _GLXAPI_VERSION_1_3 - GLXFBConfig (*ChooseFBConfig)(Display *dpy, int screen, const int *attribList, int *nitems); + GLXFBConfig *(*ChooseFBConfig)(Display *dpy, int screen, const int *attribList, int *nitems); GLXContext (*CreateNewContext)(Display *dpy, GLXFBConfig config, int renderType, GLXContext shareList, Bool direct); GLXPbuffer (*CreatePbuffer)(Display *dpy, GLXFBConfig config, const int *attribList); GLXPixmap (*CreatePixmap)(Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attribList); @@ -94,6 +94,7 @@ struct _glxapi_table { void (*DestroyWindow)(Display *dpy, GLXWindow window); /*GLXDrawable (*GetCurrentReadDrawable)(void);*/ int (*GetFBConfigAttrib)(Display *dpy, GLXFBConfig config, int attribute, int *value); + GLXFBConfig *(*GetFBConfigs)(Display *dpy, int screen, int *nelements); void (*GetSelectedEvent)(Display *dpy, GLXDrawable drawable, unsigned long *mask); XVisualInfo *(*GetVisualFromFBConfig)(Display *dpy, GLXFBConfig config); Bool (*MakeContextCurrent)(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); |