Mesa (7.8-gles): egl_dri2: Downgrade initialization errors to warnings
Kristian Høgsberg
krh at kemper.freedesktop.org
Fri May 14 19:23:44 UTC 2010
Module: Mesa
Branch: 7.8-gles
Commit: 12f4f51873ef9cb8c0f1bcbc672d592dc6dd6187
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=12f4f51873ef9cb8c0f1bcbc672d592dc6dd6187
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Thu May 13 15:42:51 2010 -0400
egl_dri2: Downgrade initialization errors to warnings
Don't want to shutdown everything if egl_dri2 fails to initialize.
---
src/egl/drivers/dri2/egl_dri2.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 6270f1a..d37ae70 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -688,7 +688,7 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp,
}
if (dri2_dpy->driver == NULL) {
- _eglLog(_EGL_FATAL,
+ _eglLog(_EGL_WARNING,
"DRI2: failed to open any driver (search paths %s)",
search_paths);
goto cleanup_conn;
@@ -697,7 +697,7 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp,
_eglLog(_EGL_DEBUG, "DRI2: dlopen(%s)", path);
extensions = dlsym(dri2_dpy->driver, __DRI_DRIVER_EXTENSIONS);
if (extensions == NULL) {
- _eglLog(_EGL_FATAL,
+ _eglLog(_EGL_WARNING,
"DRI2: driver exports no extensions (%s)", dlerror());
goto cleanup_driver;
}
@@ -707,7 +707,7 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp,
dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR);
if (dri2_dpy->fd == -1) {
- _eglLog(_EGL_FATAL,
+ _eglLog(_EGL_WARNING,
"DRI2: could not open %s (%s)", dri2_dpy->device_name,
strerror(errno));
goto cleanup_driver;
@@ -746,7 +746,7 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp,
&dri2_dpy->driver_configs, dri2_dpy);
if (dri2_dpy->dri_screen == NULL) {
- _eglLog(_EGL_FATAL, "DRI2: failed to create dri screen");
+ _eglLog(_EGL_WARNING, "DRI2: failed to create dri screen");
goto cleanup_fd;
}
More information about the mesa-commit
mailing list