Brian Paul wrote:
>
> Jens Owen wrote:
> >
> > Brian Paul wrote:
> > >
> > > Jens Owen wrote:
> > >
> > > > Wasn't this stuff recently submitted to the DRI trunk? Maybe we can fix
> > > > this incompatability if this hasn't propogated out to any major distros,
> > > > yet.
> > >
> > > Yes, we should really fix it ASAP.
> >
> > Was this part of Mesa 4? So this wouldn't have gone out in XFree86 4.2
> > or any other source releases where we care about binary compatability,
> > right?
>
> It's not a Mesa issue, it's an XFree86 libGL issue.
>
> Just remove the field from the struct and replace any occuraces of the
> field with 'currentDrawable. instead. That'll work fine.
I've patched every occurance with the attached patch, but 3 out of 5
occurances are from the /extras/Mesa tree.
Please propegate this patch back to Mesa, or if you want a different
fix, propogate that patch to me so we can sync up the /extra/Mesa tree.
Thanks,
Jens
-- /\
Jens Owen / \/\ _
[EMAIL PROTECTED] / \ \ \ Steamboat Springs, Colorado
Index: extras/Mesa/src/X/fakeglx.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/extras/Mesa/src/X/fakeglx.c,v
retrieving revision 1.16
diff -u -r1.16 fakeglx.c
--- extras/Mesa/src/X/fakeglx.c 14 Feb 2002 01:59:35 -0000 1.16
+++ extras/Mesa/src/X/fakeglx.c 14 Mar 2002 13:34:44 -0000
@@ -1233,7 +1233,6 @@
if (XMesaMakeCurrent2(xmctx, drawBuffer, readBuffer)) {
((__GLXcontext *) ctx)->currentDpy = dpy;
((__GLXcontext *) ctx)->currentDrawable = draw;
- ((__GLXcontext *) ctx)->currentReadable = read;
#ifdef GLX_BUILT_IN_XMESA
printf("Set fake context ctx %p\n", ctx);
__glXSetCurrentContext(ctx);
Index: extras/Mesa/src/X/glxapi.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/extras/Mesa/src/X/glxapi.c,v
retrieving revision 1.8.2.1
diff -u -r1.8.2.1 glxapi.c
--- extras/Mesa/src/X/glxapi.c 20 Feb 2002 05:07:13 -0000 1.8.2.1
+++ extras/Mesa/src/X/glxapi.c 14 Mar 2002 13:37:38 -0000
@@ -478,7 +478,7 @@
GLXDrawable glXGetCurrentReadDrawable(void)
{
__GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext();
- return gc ? gc->currentReadable : 0;
+ return gc ? gc->currentDrawable : 0;
}
#endif
Index: extras/Mesa/src/X/glxapi.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/extras/Mesa/src/X/glxapi.h,v
retrieving revision 1.8
diff -u -r1.8 glxapi.h
--- extras/Mesa/src/X/glxapi.h 14 Feb 2002 01:59:35 -0000 1.8
+++ extras/Mesa/src/X/glxapi.h 14 Mar 2002 13:39:13 -0000
@@ -42,7 +42,6 @@
Display *currentDpy;
GLboolean isDirect;
GLXDrawable currentDrawable;
- GLXDrawable currentReadable;
XID xid;
} __GLXcontext;
#endif
Index: lib/GL/glx/glxclient.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/glx/glxclient.h,v
retrieving revision 1.17
diff -u -r1.17 glxclient.h
--- lib/GL/glx/glxclient.h 14 Feb 2002 01:59:47 -0000 1.17
+++ lib/GL/glx/glxclient.h 14 Mar 2002 13:50:41 -0000
@@ -404,7 +404,6 @@
** context is not current to any drawable.
*/
GLXDrawable currentDrawable;
- GLXDrawable currentReadable;
/*
** Constant strings that describe the server implementation
Index: lib/GL/glx/glxcmds.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/glx/glxcmds.c,v
retrieving revision 1.22.2.1
diff -u -r1.22.2.1 glxcmds.c
--- lib/GL/glx/glxcmds.c 20 Feb 2002 05:06:42 -0000 1.22.2.1
+++ lib/GL/glx/glxcmds.c 14 Mar 2002 13:52:59 -0000
@@ -1602,7 +1602,7 @@
GLXDrawable glXGetCurrentReadDrawable(void)
{
GLXContext gc = __glXGetCurrentContext();
- return gc->currentReadable;
+ return gc->currentDrawable;
}
