egl: rename LIBGL_ALWAYS_SOFTWARE variable from UseFallback to ForceSoftware

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 1b3092b7b3bf43324c9e354bb6f664712fe24bf6..34e3ef66bfeb91f9c2fa3f920ba51ddd1fbdf369 100644 (file)
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -1180,7 +1180,7 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
    int ret;
 
    /* Not supported yet */
-   if (disp->Options.UseFallback)
+   if (disp->Options.ForceSoftware)
       return EGL_FALSE;
 
    loader_set_logger(_eglLog);

diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c
index a2d18ef508938c7ec355b2c2e7b00113ebe8ec59..6e7403d9ab27ba938ece47908693f1bd99035754 100644 (file)
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -653,7 +653,7 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
    const char *err;
 
    /* Not supported yet */
-   if (disp->Options.UseFallback)
+   if (disp->Options.ForceSoftware)
       return EGL_FALSE;
 
    loader_set_logger(_eglLog);

diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c
index 977b046016665aa9914853d2ab8d1cc8b9427d85..70b302c0ce42f8ec8a5a6961bf3e267d009e4e55 100644 (file)
--- a/src/egl/drivers/dri2/platform_surfaceless.c
+++ b/src/egl/drivers/dri2/platform_surfaceless.c
@@ -324,7 +324,7 @@ dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp)
    dri2_dpy->fd = -1;
    disp->DriverData = (void *) dri2_dpy;
 
-   if (!disp->Options.UseFallback) {
+   if (!disp->Options.ForceSoftware) {
       driver_loaded = surfaceless_probe_device(disp, false);
       if (!driver_loaded)
          _eglLog(_EGL_WARNING,

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 02b32f988858303a5013c458e2996c5f585ee470..05a347abfcec87bfe8736dc0a18aa531c573c36a 100644 (file)
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1999,7 +1999,7 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
 {
    EGLBoolean initialized = EGL_FALSE;
 
-   if (!disp->Options.UseFallback)
+   if (!disp->Options.ForceSoftware)
       initialized = dri2_initialize_wayland_drm(drv, disp);
 
    if (!initialized)

diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 8ede590bfab383cff9653d701234ef68a1bde491..78a51ba0e53e8fe8b22975cf58ec52c9279bfde0 100644 (file)
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -1459,7 +1459,7 @@ dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp)
 {
    EGLBoolean initialized = EGL_FALSE;
 
-   if (!disp->Options.UseFallback) {
+   if (!disp->Options.ForceSoftware) {
 #ifdef HAVE_DRI3
       if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
          initialized = dri2_initialize_x11_dri3(drv, disp);

diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index 0005c81836d45c917326591b3b097b4e55f40867..addf430ffed59937f147428033142356b5bf887b 100644 (file)
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -160,7 +160,7 @@ struct _egl_display
 
    /* options that affect how the driver initializes the display */
    struct {
-      EGLBoolean UseFallback; /**< Use fallback driver (sw or less features) */
+      EGLBoolean ForceSoftware; /**< Use software path only */
       void *Platform;         /**< Platform-specific options */
    } Options;
 

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 34a90ae5dc56c4543b4cd09f6b7755439977f769..ee3dc86e388512c291b0ccce27483fb71e66740c 100644 (file)
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -84,12 +84,12 @@ _eglMatchDriver(_EGLDisplay *dpy)
    assert(!dpy->Initialized);
 
    /* set options */
-   dpy->Options.UseFallback =
+   dpy->Options.ForceSoftware =
       env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
 
    best_drv = _eglMatchAndInitialize(dpy);
    if (!best_drv) {
-      dpy->Options.UseFallback = EGL_TRUE;
+      dpy->Options.ForceSoftware = EGL_TRUE;
       best_drv = _eglMatchAndInitialize(dpy);
    }