This just changes the error message printed with LIBGL_DEBUG when loading
dri2 driver fails. It makes it more informative, more consistent with second
fallback swrast->indirect , and possibly more consistent with old dri1
behavior.
OLD:
libGL error: dlopen foo/nouveau_dri.so failed (foo/nouveau_dri.so: cannot open shared object file: No such file or directory)
libGL error: unable to load driver: nouveau_dri.so
libGL error: driver pointer missing
libGL error: dlopen foo/swrast_dri.so failed (foo/swrast_dri.so: cannot open shared object file: No such file or directory)
libGL error: unable to load driver: swrast_dri.so
libGL error: reverting to indirect rendering
NEW:
libGL error: dlopen foo/nouveau_dri.so failed (foo/nouveau_dri.so: cannot open shared object file: No such file or directory)
libGL error: unable to load driver: nouveau_dri.so
libGL error: reverting to software direct rendering
libGL error: dlopen foo/swrast_dri.so failed (foo/swrast_dri.so: cannot open shared object file: No such file or directory)
libGL error: unable to load driver: swrast_dri.so
libGL error: reverting to indirect rendering
Signed-off-by: Xavier Chantry <cha...@gm...>
---
src/glx/dri2_glx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 5b0f335..903c8c9 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -527,7 +527,6 @@ dri2CreateScreen(__GLXscreenConfigs * psc, int screen,
psc->driver = driOpenDriver(driverName);
if (psc->driver == NULL) {
- ErrorMessageF("driver pointer missing\n");
goto handle_error;
}
@@ -633,6 +632,7 @@ handle_error:
/* FIXME: clean up here */
+ ErrorMessageF("reverting to software direct rendering\n");
return NULL;
}
--
1.7.0.2
|
