egl: Remove _eglOpenDriver and _eglCloseDriver.

_eglCloseDriver is no-op and _eglOpenDriver does nothing but call
_eglMatchDriver.  Export _eglMatchDriver directly.
This commit is contained in:
Chia-I Wu
2010-01-26 18:41:15 +08:00
parent 545eaf83b5
commit 092b1ca989
3 changed files with 4 additions and 32 deletions
+2 -5
View File
@@ -104,15 +104,13 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
if (!drv) {
_eglPreloadDrivers();
drv = _eglOpenDriver(disp);
drv = _eglMatchDriver(disp);
if (!drv)
return _eglError(EGL_NOT_INITIALIZED, __FUNCTION__);
/* Initialize the particular display now */
if (!drv->API.Initialize(drv, disp, &major_int, &minor_int)) {
_eglCloseDriver(drv, disp);
if (!drv->API.Initialize(drv, disp, &major_int, &minor_int))
return _eglError(EGL_NOT_INITIALIZED, __FUNCTION__);
}
disp->APImajor = major_int;
disp->APIminor = minor_int;
@@ -150,7 +148,6 @@ eglTerminate(EGLDisplay dpy)
drv = disp->Driver;
if (drv) {
drv->API.Terminate(drv, disp);
_eglCloseDriver(drv, disp);
disp->Driver = NULL;
}
+1 -22
View File
@@ -269,7 +269,7 @@ _eglLoadDriver(const char *path, const char *args)
*
* The matching is done by finding the driver with the highest score.
*/
static _EGLDriver *
_EGLDriver *
_eglMatchDriver(_EGLDisplay *dpy)
{
_EGLDriver *best_drv = NULL;
@@ -298,27 +298,6 @@ _eglMatchDriver(_EGLDisplay *dpy)
}
/**
* Open a preloaded driver.
*/
_EGLDriver *
_eglOpenDriver(_EGLDisplay *dpy)
{
_EGLDriver *drv = _eglMatchDriver(dpy);
return drv;
}
/**
* Close a preloaded driver.
*/
EGLBoolean
_eglCloseDriver(_EGLDriver *drv, _EGLDisplay *dpy)
{
return EGL_TRUE;
}
/**
* Preload a user driver.
*
+1 -5
View File
@@ -43,11 +43,7 @@ _eglMain(const char *args);
extern _EGLDriver *
_eglOpenDriver(_EGLDisplay *dpy);
extern EGLBoolean
_eglCloseDriver(_EGLDriver *drv, _EGLDisplay *dpy);
_eglMatchDriver(_EGLDisplay *dpy);
extern EGLBoolean