summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/x11/fakeglx.c6
-rw-r--r--src/mesa/drivers/x11/glxapi.c5
-rw-r--r--src/mesa/drivers/x11/glxapi.h4
3 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index fad572f0901..fd57fba7ee4 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 2bbe879f953..f46e36062b2 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 33105f43d88..c9a8f938164 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);