egl: move eglQueryContext() fallback to eglapi.c

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

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 1ff37850e05f729dd35a9536c805c8dd4d17530f..4dc46b35e9555f96d4917cb1b03fc1cb8d366544 100644 (file)
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -58,6 +58,7 @@ _eglGetDriver(void)
       _eglDriver = calloc(1, sizeof(*_eglDriver));
       if (!_eglDriver)
          return NULL;
+      _eglInitDriverFallbacks(_eglDriver);
       _eglInitDriver(_eglDriver);
    }
 
@@ -67,10 +68,10 @@ _eglGetDriver(void)
 }
 
 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;
@@ -81,25 +82,25 @@ _eglMatchAndInitialize(_EGLDisplay *dpy)
  * 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.UseFallback =
+   disp->Options.ForceSoftware =
       env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
 
-   best_drv = _eglMatchAndInitialize(dpy);
-   if (!best_drv) {
-      dpy->Options.UseFallback = 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) {
-      dpy->Driver = best_drv;
-      dpy->Initialized = EGL_TRUE;
+      disp->Driver = best_drv;
+      disp->Initialized = EGL_TRUE;
    }
 
    return best_drv;
@@ -108,7 +109,7 @@ _eglMatchDriver(_EGLDisplay *dpy)
 __eglMustCastToProperFunctionPointerType
 _eglGetDriverProc(const char *procname)
 {
-   if (_eglGetDriver())
+   if (_eglGetDriver() && _eglDriver->API.GetProcAddress)
       return _eglDriver->API.GetProcAddress(_eglDriver, procname);
 
    return NULL;