Mesa (gallium-0.2): egl: fix makecurrent with null drawable/context

Alan Hourihane alanh at kemper.freedesktop.org
Wed Jan 14 11:58:12 UTC 2009


Module: Mesa
Branch: gallium-0.2
Commit: 3ef419f4a5d0c5bb6720196ae6cfe3002d4aabc8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ef419f4a5d0c5bb6720196ae6cfe3002d4aabc8

Author: Alan Hourihane <alanh at vmware.com>
Date:   Wed Jan 14 11:34:29 2009 +0000

egl: fix makecurrent with null drawable/context

---

 src/egl/drivers/glx/egl_glx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/egl/drivers/glx/egl_glx.c b/src/egl/drivers/glx/egl_glx.c
index c93e568..8ba70ba 100644
--- a/src/egl/drivers/glx/egl_glx.c
+++ b/src/egl/drivers/glx/egl_glx.c
@@ -578,7 +578,7 @@ GLX_eglMakeCurrent(_EGLDriver *drv, EGLDisplay dpy, EGLSurface d,
       return EGL_FALSE;
 
 #ifdef GLX_VERSION_1_3
-   if (!glXMakeContextCurrent(disp->Xdpy, GLX_dsurf->drawable, GLX_rsurf->drawable, GLX_ctx->context))
+   if (!glXMakeContextCurrent(disp->Xdpy, GLX_dsurf ? GLX_dsurf->drawable : 0, GLX_rsurf ? GLX_rsurf->drawable : 0, GLX_ctx ? GLX_ctx->context : NULL))
 #endif
       if (!glXMakeCurrent(disp->Xdpy, GLX_dsurf ? GLX_dsurf->drawable : 0, GLX_ctx ? GLX_ctx->context : NULL))
          return EGL_FALSE;




More information about the mesa-commit mailing list