summaryrefslogtreecommitdiff
path: root/src/egl
diff options
context:
space:
mode:
Diffstat (limited to 'src/egl')
-rw-r--r--src/egl/main/eglapi.c7
-rw-r--r--src/egl/main/egldriver.c23
-rw-r--r--src/egl/main/egldriver.h6
3 files changed, 4 insertions, 32 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 492a14180a..90828bd3e9 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -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;
}
diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index b820b966f9..1dadbf783b 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -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;
@@ -299,27 +299,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.
*
* A user driver can be specified by EGL_DRIVER.
diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index 4a1a7ece8c..6ebb60a8f1 100644
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -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