From: Brian Paul Date: Sun, 27 Feb 2000 18:26:54 +0000 (+0000) Subject: changed glXCopyContext() mask to unsigned long, per GLX spec X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3994b77bab8c62a4c1a4dffdfba233ef46662b99;p=mesa.git changed glXCopyContext() mask to unsigned long, per GLX spec --- diff --git a/include/GL/glx.h b/include/GL/glx.h index d770fb989e8..a1d28bcc7fe 100644 --- a/include/GL/glx.h +++ b/include/GL/glx.h @@ -1,4 +1,4 @@ -/* $Id: glx.h,v 1.12 2000/02/25 12:35:57 joukj Exp $ */ +/* $Id: glx.h,v 1.13 2000/02/27 18:26:54 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -225,7 +225,7 @@ extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable, GLXContext ctx); extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst, - GLuint mask ); + unsigned long mask ); extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable ); diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index c9e5a2b1cc4..152e661e983 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -1,4 +1,4 @@ -/* $Id: fakeglx.c,v 1.23 2000/02/25 17:04:42 brianp Exp $ */ +/* $Id: fakeglx.c,v 1.24 2000/02/27 18:26:54 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1207,7 +1207,7 @@ 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; diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 73fbba3263c..ffdfe65ac0d 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -1,4 +1,4 @@ -/* $Id: glxapi.c,v 1.14 2000/02/25 17:04:42 brianp Exp $ */ +/* $Id: glxapi.c,v 1.15 2000/02/27 18:26:54 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -169,7 +169,7 @@ 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 64102c45bf8..27d62d8fae1 100644 --- a/src/mesa/drivers/x11/glxapi.h +++ b/src/mesa/drivers/x11/glxapi.h @@ -1,4 +1,4 @@ -/* $Id: glxapi.h,v 1.3 2000/02/25 17:04:42 brianp Exp $ */ +/* $Id: glxapi.h,v 1.4 2000/02/27 18:26:54 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);