diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2010-01-19 18:29:21 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2010-01-20 17:40:07 +0800 |
| commit | 57929eda3e876dc60be7060237a669f042be2376 (patch) | |
| tree | f926ddc9ebf116050ae452a01434ba1cb28103c6 /src | |
| parent | b3bcd33f7a8b32ce4ea6e979e9cc764d0f903ae9 (diff) | |
egl: Use _eglPreloadDrivers.
Replace the use of _eglPreloadDriver by _eglPreloadDrivers. The latter
supports EGL_DISPLAY which have a better chance to "just work".
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/main/eglapi.c | 6 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.c | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 26e0602453..6e8f444d7f 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -101,6 +101,8 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) drv = disp->Driver; if (!drv) { + _eglPreloadDrivers(); + drv = _eglOpenDriver(disp); if (!drv) return _eglError(EGL_NOT_INITIALIZED, __FUNCTION__); @@ -710,9 +712,7 @@ void (* EGLAPIENTRY eglGetProcAddress(const char *procname))() } } - /* preload a driver if there isn't one */ - if (!_eglGlobal.NumDrivers) - _eglPreloadDriver(NULL); + _eglPreloadDrivers(); /* now loop over drivers to query their procs */ for (i = 0; i < _eglGlobal.NumDrivers; i++) { diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index 896d60dbe1..a65ac6e969 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -81,12 +81,6 @@ _eglNewDisplay(NativeDisplayType nativeDisplay) _EGLDisplay *dpy = (_EGLDisplay *) calloc(1, sizeof(_EGLDisplay)); if (dpy) { dpy->NativeDisplay = nativeDisplay; - - dpy->DriverName = _eglPreloadDriver(dpy); - if (!dpy->DriverName) { - free(dpy); - return NULL; - } } return dpy; } |