Use {prev}glxc instead of pDraw to access pScreen. Fixes

glXMakeCurrent(dpy, None, NULL).
This commit is contained in:
Kevin E Martin 2006-02-02 20:33:59 +00:00
parent 3cbcc11707
commit b294f9e55e
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2006-02-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
* GL/glx/glxcmds.c: (DoMakeCurrent):
Use {prev}glxc instead of pDraw to access pScreen. Fixes
glXMakeCurrent(dpy, None, NULL).
2006-02-01 Kristian Høgsberg <krh@redhat.com>
* hw/xfree86/dri/dri.c (DRIUnlockedCallback): Also drop drawable lock.

View file

@ -618,7 +618,7 @@ int DoMakeCurrent( __GLXclientState *cl,
/* FIXME-KRH: this is where we need the looseContext function
* in the DRIcontext interface. */
if (!(*prevglxc->driContext.unbindContext)(NULL, pDraw->pScreen->myNum,
if (!(*prevglxc->driContext.unbindContext)(NULL, prevglxc->pScreen->myNum,
0, /* prev draw */
0, /* prev read */
&prevglxc->driContext)) {
@ -631,7 +631,7 @@ int DoMakeCurrent( __GLXclientState *cl,
if ((glxc != 0) && !glxc->isDirect) {
/* make the context current */
if (!(*glxc->driContext.bindContext)(NULL, pDraw->pScreen->myNum,
if (!(*glxc->driContext.bindContext)(NULL, glxc->pScreen->myNum,
drawId, readId,
&glxc->driContext)) {
return __glXBadContext;