added some casts so that older glx.h can be used
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user