summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-05-24 20:05:32 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-05-24 20:05:32 +0000
commit12c1bee87fcc3a0912685bb6e83447972e5de64e (patch)
treee9bfc86baa6e82ab0ef27ce428cc32fb3a98e088 /src/mesa/drivers
parente203c9cdd8ef0b0b053923e630e291f5671a9ab4 (diff)
added some casts so that older glx.h can be used
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/x11/fakeglx.c8
-rw-r--r--src/mesa/drivers/x11/glxapi.c10
2 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 5d6098f14a..71e52039d3 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.50 2001/05/24 19:06:21 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.51 2001/05/24 20:05:32 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1231,9 +1231,9 @@ Fake_glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
/* Now make current! */
if (XMesaMakeCurrent2(xmctx, drawBuffer, readBuffer)) {
- ctx->currentDpy = dpy;
- ctx->currentDrawable = draw;
- ctx->currentReadable = read;
+ ((__GLXcontext *) ctx)->currentDpy = dpy;
+ ((__GLXcontext *) ctx)->currentDrawable = draw;
+ ((__GLXcontext *) ctx)->currentReadable = read;
#ifdef GLX_BUILD_IN_XLIB_MESA
__glXSetCurrentContext(ctx);
#endif
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index cd94ac8361..4eb78ea4c2 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1,4 +1,4 @@
-/* $Id: glxapi.c,v 1.22 2001/05/24 19:06:21 brianp Exp $ */
+/* $Id: glxapi.c,v 1.23 2001/05/24 20:05:32 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -255,7 +255,7 @@ GLXContext glXGetCurrentContext(void)
GLXDrawable glXGetCurrentDrawable(void)
{
- GLXContext gc = glXGetCurrentContext();
+ __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext();
return gc ? gc->currentDrawable : 0;
}
@@ -390,7 +390,7 @@ const char *glXQueryServerString(Display *dpy, int screen, int name)
Display *glXGetCurrentDisplay(void)
{
/* Same code as in libGL's glxext.c */
- GLXContext gc = __glXGetCurrentContext();
+ __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext();
if (NULL == gc) return NULL;
return gc->currentDpy;
}
@@ -482,7 +482,7 @@ void glXDestroyWindow(Display *dpy, GLXWindow window)
GLXDrawable glXGetCurrentReadDrawable(void)
{
- GLXContext gc = glXGetCurrentContext();
+ __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext();
return gc ? gc->currentReadable : 0;
}
@@ -674,7 +674,7 @@ void glXFreeContextEXT(Display *dpy, GLXContext context)
/* stand-alone Mesa */
GLXContextID glXGetContextIDEXT(const GLXContext context)
{
- return context->xid;
+ return ((__GLXcontext *) context)->xid;
}
#endif