diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-02-23 23:04:27 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-02-23 23:04:27 +0000 |
| commit | f3232bcaf1f875e6a7198e3b5ede3e286ceb04fa (patch) | |
| tree | 4a104e02bf76ee3a1a7b189cd77b430dd67dfb10 /src | |
| parent | 7ac435066a2af75711369bab609e7551ede23b39 (diff) | |
changed glXCopyContext()'s mask to unsigned long
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/x11/fakeglx.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index fad572f090..fd57fba7ee 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -1,4 +1,4 @@ -/* $Id: fakeglx.c,v 1.21 2000/01/27 16:45:50 brianp Exp $ */ +/* $Id: fakeglx.c,v 1.22 2000/02/23 23:09:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1207,12 +1207,12 @@ Fake_glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap ) static void Fake_glXCopyContext( Display *dpy, GLXContext src, GLXContext dst, - GLuint mask ) + unsigned long mask ) { XMesaContext xm_src = (XMesaContext) src; XMesaContext xm_dst = (XMesaContext) dst; (void) dpy; - gl_copy_context( xm_src->gl_ctx, xm_dst->gl_ctx, mask ); + gl_copy_context( xm_src->gl_ctx, xm_dst->gl_ctx, (GLuint) mask ); } diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 2bbe879f95..f46e36062b 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -1,4 +1,4 @@ -/* $Id: glxapi.c,v 1.10 1999/12/10 15:16:49 brianp Exp $ */ +/* $Id: glxapi.c,v 1.11 2000/02/23 23:09:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -169,7 +169,8 @@ XVisualInfo *glXChooseVisual(Display *dpy, int screen, int *list) } -void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, GLuint mask) +void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, + unsigned long mask) { struct _glxapi_table *t = get_dispatch(dpy); if (!t) diff --git a/src/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h index 33105f43d8..c9a8f93816 100644 --- a/src/mesa/drivers/x11/glxapi.h +++ b/src/mesa/drivers/x11/glxapi.h @@ -1,4 +1,4 @@ -/* $Id: glxapi.h,v 1.1 1999/11/28 20:07:19 brianp Exp $ */ +/* $Id: glxapi.h,v 1.2 2000/02/23 23:09:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -56,7 +56,7 @@ struct _glxapi_table { /* GLX 1.0 functions */ XVisualInfo *(*ChooseVisual)(Display *dpy, int screen, int *list); - void (*CopyContext)(Display *dpy, GLXContext src, GLXContext dst, GLuint mask); + void (*CopyContext)(Display *dpy, GLXContext src, GLXContext dst, unsigned long mask); GLXContext (*CreateContext)(Display *dpy, XVisualInfo *visinfo, GLXContext shareList, Bool direct); GLXPixmap (*CreateGLXPixmap)(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap); void (*DestroyContext)(Display *dpy, GLXContext ctx); |