summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-02-25 17:04:42 +0000
committerBrian Paul <[email protected]>2000-02-25 17:04:42 +0000
commitc1aa1218ef301b0fd0a7c948ac38b531632ceca6 (patch)
tree3f42c0317524f269e30aa24562732c48cd5129e0
parent9ec28c03c07cdae1305d5911317eee8c0ca66db1 (diff)
changed glXCopyContext mask back to GLuint
-rw-r--r--src/mesa/drivers/x11/fakeglx.c4
-rw-r--r--src/mesa/drivers/x11/glxapi.c5
-rw-r--r--src/mesa/drivers/x11/glxapi.h4
3 files changed, 6 insertions, 7 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index fd57fba7ee4..c9e5a2b1cc4 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.22 2000/02/23 23:09:12 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.23 2000/02/25 17:04:42 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,
- unsigned long mask )
+ GLuint 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 f7ab770cea5..73fbba3263c 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1,4 +1,4 @@
-/* $Id: glxapi.c,v 1.13 2000/02/25 16:46:01 brianp Exp $ */
+/* $Id: glxapi.c,v 1.14 2000/02/25 17:04:42 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -169,8 +169,7 @@ XVisualInfo *glXChooseVisual(Display *dpy, int screen, int *list)
}
-void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst,
- unsigned long mask)
+void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, GLuint 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 c9a8f938164..64102c45bf8 100644
--- a/src/mesa/drivers/x11/glxapi.h
+++ b/src/mesa/drivers/x11/glxapi.h
@@ -1,4 +1,4 @@
-/* $Id: glxapi.h,v 1.2 2000/02/23 23:09:12 brianp Exp $ */
+/* $Id: glxapi.h,v 1.3 2000/02/25 17:04:42 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, unsigned long mask);
+ void (*CopyContext)(Display *dpy, GLXContext src, GLXContext dst, GLuint 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);