From 9cfaaa291f9c69cfc24e8a9c0d7de47319e479ed Mon Sep 17 00:00:00 2001 From: Micah Fedke Date: Wed, 28 Apr 2010 07:25:58 -0600 Subject: egl: dri2 driver error output This patch amends the error output string for the case where the dri2 egl driver could not open the dri dev node. Signed-off-by: Brian Paul --- src/egl/drivers/dri2/egl_dri2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 15b3529cd2..2dfb70de00 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -706,7 +706,8 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp, dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR); if (dri2_dpy->fd == -1) { _eglLog(_EGL_FATAL, - "DRI2: could not open %s (%s)", path, strerror(errno)); + "DRI2: could not open %s (%s)", dri2_dpy->device_name, + strerror(errno)); goto cleanup_driver; } -- cgit v1.2.3 From ef9a8fcb1b651b95c570fd3a46cdea4751d2b725 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Wed, 28 Apr 2010 16:19:41 +0100 Subject: glx: Fix build --- src/glx/glxcmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index e74ae3472e..b0482977d5 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -887,7 +887,7 @@ glXCopyContext(Display * dpy, GLXContext source, static Bool __glXIsDirect(Display * dpy, GLXContextID contextID) { -#ifndef GLX_USE_APPLEGL /* TODO: apple indirect */ +#ifdef GLX_USE_APPLEGL /* TODO: apple indirect */ return GC_IS_DIRECT(gc); #else #if !defined(USE_XCB) -- cgit v1.2.3