egl: drop unused _EGLDriver from GetProcAddress()

[mesa.git] / src / egl / main / egldriver.c

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index e6d5098472755000df9ca513e808815982c56a40..987b4b333ea3b2abfa60c38105a49991bb757e61 100644 (file)
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -46,26 +46,15 @@
 
 #include "util/debug.h"
 
-extern _EGLDriver _eglDriver;
-
-static _EGLDriver *
-_eglMatchAndInitialize(_EGLDisplay *disp)
-{
-   if (_eglDriver.Initialize(&_eglDriver, disp))
-      return &_eglDriver;
-
-   return NULL;
-}
+extern const _EGLDriver _eglDriver;
 
 /**
- * Match a display to a driver.  The matching is done by finding the first
- * driver that can initialize the display.
+ * Initialize the display using the driver's function.
+ * If the initialisation fails, try again using only software rendering.
  */
 bool
-_eglMatchDriver(_EGLDisplay *disp)
+_eglInitializeDisplay(_EGLDisplay *disp)
 {
-   _EGLDriver *best_drv;
-
    assert(!disp->Initialized);
 
    /* set options */
@@ -74,25 +63,29 @@ _eglMatchDriver(_EGLDisplay *disp)
    if (disp->Options.ForceSoftware)
       _eglLog(_EGL_DEBUG, "Found 'LIBGL_ALWAYS_SOFTWARE' set, will use a CPU renderer");
 
-   best_drv = _eglMatchAndInitialize(disp);
-   if (!best_drv && !disp->Options.ForceSoftware) {
-      disp->Options.ForceSoftware = EGL_TRUE;
-      best_drv = _eglMatchAndInitialize(disp);
-   }
-
-   if (best_drv) {
-      disp->Driver = best_drv;
+   if (_eglDriver.Initialize(disp)) {
+      disp->Driver = &_eglDriver;
       disp->Initialized = EGL_TRUE;
+      return true;
    }
 
-   return best_drv != NULL;
+   if (disp->Options.ForceSoftware)
+      return false;
+
+   disp->Options.ForceSoftware = EGL_TRUE;
+   if (!_eglDriver.Initialize(disp))
+      return false;
+
+   disp->Driver = &_eglDriver;
+   disp->Initialized = EGL_TRUE;
+   return true;
 }
 
 __eglMustCastToProperFunctionPointerType
 _eglGetDriverProc(const char *procname)
 {
    if (_eglDriver.GetProcAddress)
-      return _eglDriver.GetProcAddress(&_eglDriver, procname);
+      return _eglDriver.GetProcAddress(procname);
 
    return NULL;
 }