{
mtx_lock(&_eglModuleMutex);
- if (!_eglDriver)
- _eglDriver = _eglBuiltInDriver();
+ if (!_eglDriver) {
+ _eglDriver = calloc(1, sizeof(*_eglDriver));
+ if (!_eglDriver) {
+ mtx_unlock(&_eglModuleMutex);
+ return NULL;
+ }
+ _eglInitDriver(_eglDriver);
+ }
mtx_unlock(&_eglModuleMutex);
}
static _EGLDriver *
-_eglMatchAndInitialize(_EGLDisplay *dpy)
+_eglMatchAndInitialize(_EGLDisplay *disp)
{
if (_eglGetDriver())
- if (_eglDriver->API.Initialize(_eglDriver, dpy))
+ if (_eglDriver->API.Initialize(_eglDriver, disp))
return _eglDriver;
return NULL;
* driver that can initialize the display.
*/
_EGLDriver *
-_eglMatchDriver(_EGLDisplay *dpy)
+_eglMatchDriver(_EGLDisplay *disp)
{
_EGLDriver *best_drv;
- assert(!dpy->Initialized);
+ assert(!disp->Initialized);
/* set options */
- dpy->Options.ForceSoftware =
+ disp->Options.ForceSoftware =
env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
+ if (disp->Options.ForceSoftware)
+ _eglLog(_EGL_DEBUG, "Found 'LIBGL_ALWAYS_SOFTWARE' set, will use a CPU renderer");
- best_drv = _eglMatchAndInitialize(dpy);
- if (!best_drv) {
- dpy->Options.ForceSoftware = EGL_TRUE;
- best_drv = _eglMatchAndInitialize(dpy);
+ best_drv = _eglMatchAndInitialize(disp);
+ if (!best_drv && !disp->Options.ForceSoftware) {
+ disp->Options.ForceSoftware = EGL_TRUE;
+ best_drv = _eglMatchAndInitialize(disp);
}
if (best_drv) {
- _eglLog(_EGL_DEBUG, "the best driver is %s",
- best_drv->Name);
- dpy->Driver = best_drv;
- dpy->Initialized = EGL_TRUE;
+ disp->Driver = best_drv;
+ disp->Initialized = EGL_TRUE;
}
return best_drv;
__eglMustCastToProperFunctionPointerType
_eglGetDriverProc(const char *procname)
{
- if (_eglGetDriver())
+ if (_eglGetDriver() && _eglDriver->API.GetProcAddress)
return _eglDriver->API.GetProcAddress(_eglDriver, procname);
return NULL;