fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dri: Emit a critical error if the swrast driver fails to load.

Browse source 
Something has gone wrong if swrast is requested but cannot be
loaded. The user really should be made aware of this, (and instructed
to set LIBGL_DEBUG for more details).

The wording of this error message is updated from "reverting to
indirect rendering" to the more objectively descriptive "failed to
load driver: swrast". The former wording makes assumptions about what
the calling code will decide to do next, rather than simply describing
what went wrong within the current function. The new wording is
consistent with the critical errors recently added for hardware
drivers that fail to load.

Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
This commit is contained in:
Carl Worth 2012-02-03 16:25:38 -08:00
parent 6c9af97740
commit 26de5273ac
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glx/drisw_glx.c
View file

@ -571,13 +571,15 @@ driswDestroyScreen(struct glx_screen *base)
dlclose(psc->driver);
}
#define SWRAST_DRIVER_NAME "swrast"
static void *
driOpenSwrast(void)
{
void *driver = NULL;
if (driver == NULL)
driver = driOpenDriver("swrast");
driver = driOpenDriver(SWRAST_DRIVER_NAME);
return driver;
}
@ -702,7 +704,7 @@ driswCreateScreen(int screen, struct glx_display *priv)
glx_screen_cleanup(&psc->base);
Xfree(psc);
ErrorMessageF("reverting to indirect rendering\n");
CriticalErrorMessageF("failed to load driver: %s\n", SWRAST_DRIVER_NAME);
return NULL;
}