From b673271710047acb1976002e4b84d06b7cefd3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Wed, 17 Jan 2024 13:20:49 +0100 Subject: [PATCH 1/2] Revert "egl: add automatic zink fallback loading between hw and sw drivers" This reverts commit 8cd44b8843877a2f7d559d123eb3694841f16fdc. --- src/egl/main/eglapi.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index d50be23e871..b1a48668b76 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -695,17 +695,10 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) if (disp->Options.ForceSoftware) RETURN_EGL_ERROR(disp, EGL_NOT_INITIALIZED, EGL_FALSE); else { - bool success = false; - if (!disp->Options.Zink && !getenv("GALLIUM_DRIVER")) { - disp->Options.Zink = EGL_TRUE; - success = _eglDriver.Initialize(disp); - } - if (!success) { - disp->Options.Zink = EGL_FALSE; - disp->Options.ForceSoftware = EGL_TRUE; - if (!_eglDriver.Initialize(disp)) - RETURN_EGL_ERROR(disp, EGL_NOT_INITIALIZED, EGL_FALSE); - } + disp->Options.Zink = EGL_FALSE; + disp->Options.ForceSoftware = EGL_TRUE; + if (!_eglDriver.Initialize(disp)) + RETURN_EGL_ERROR(disp, EGL_NOT_INITIALIZED, EGL_FALSE); } } -- 2.43.0