<div dir="ltr">Reviewed-by: Gurchetan Singh <<a href="mailto:gurchetansingh@chromium.org" target="_blank" style="font-size:12.8px">gurchetansingh@chromium.org</a>><div class="gmail-yj6qo gmail-ajU" style="font-size:12.8px"></div></div><div class="gmail_extra"> <div class="gmail_quote">On Wed, Oct 18, 2017 at 9:09 AM, Eric Engestrom <<a href="mailto:eric.engestrom@imgtec.com" target="_blank">eric.engestrom@imgtec.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Suggested-by: Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com">emil.l.velikov@gmail.com</a>> Signed-off-by: Eric Engestrom <<a href="mailto:eric.engestrom@imgtec.com">eric.engestrom@imgtec.com</a>> --- src/egl/drivers/dri2/platform_surfaceless.c | 3 +-- src/egl/drivers/dri2/platform_wayland.c | 3 +-- src/egl/drivers/dri2/platform_x11.c | 2 +- src/egl/main/egldriver.c | 5 ++++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index 2af4a40b1a6b87edb9d2..977b046016665aa99148 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -36,7 +36,6 @@ #include "egl_dri2.h" #include "egl_dri2_fallbacks.h" #include "loader.h" -#include "util/debug.h" static __DRIimage* surfaceless_alloc_image(struct dri2_egl_display *dri2_dpy, @@ -325,7 +324,7 @@ dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp) dri2_dpy->fd = -1; disp->DriverData = (void *) dri2_dpy; - if (!env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false)) { + if (!disp->Options.UseFallback) { 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 14db55ca747b07fa23f5..b38eb1c3354cfb0c5015 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -42,7 +42,6 @@ #include "egl_dri2.h" #include "egl_dri2_fallbacks.h" #include "loader.h" -#include "util/debug.h" #include "util/u_vector.h" #include "eglglobals.h" @@ -1972,7 +1971,7 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp) { EGLBoolean initialized = EGL_FALSE; - if (!env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false)) + if (!disp->Options.UseFallback) 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 9c20ea8f8a98c4c2b6bd..5bcdb2dac748cc0e9901 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1460,7 +1460,7 @@ dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp) { EGLBoolean initialized = EGL_FALSE; - if (!env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false)) { + if (!disp->Options.UseFallback) { #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/egldriver.c b/src/egl/main/egldriver.c index 33f8f57aeb11e06f92f2..1ff37850e05f729dd35a 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -44,6 +44,8 @@ #include "egldriver.h" #include "egllog.h" +#include "util/debug.h" + static mtx_t _eglModuleMutex = _MTX_INITIALIZER_NP; static _EGLDriver *_eglDriver; @@ -86,7 +88,8 @@ _eglMatchDriver(_EGLDisplay *dpy) assert(!dpy->Initialized); /* set options */ - dpy->Options.UseFallback = EGL_FALSE; + dpy->Options.UseFallback = + env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false); best_drv = _eglMatchAndInitialize(dpy); if (!best_drv) { -- Cheers, Eric _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>