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>
This commit is contained in:
parent
2f421651ac
commit
81cea66ff1
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue