Mesa (master): egl_dri2: Downgrade initialization errors to warnings

Kristian Høgsberg krh at kemper.freedesktop.org
Thu May 13 20:15:19 UTC 2010


Module: Mesa
Branch: master
Commit: 7413d9ae9ff3e21f517aea97d7a1a211867bdc68
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7413d9ae9ff3e21f517aea97d7a1a211867bdc68

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 be79ae5..6386737 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -690,7 +690,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;
@@ -699,7 +699,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;
    }
@@ -709,7 +709,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;
@@ -748,7 +748,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