diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2024-03-11 13:28:11 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2024-05-10 22:52:51 +0200 |
| commit | 90012f1f667befc7700e4b9dc97ec47899d0b6b6 (patch) | |
| tree | 2005c13757ce432d73552d6e212db9202fc6a3fe | |
| parent | 38485a49f43e16883ed9416eb6eb48c9f1b42919 (diff) | |
egl/x11: disable dri3 with LIBGL_KOPPER_DRI2=1 as expected
cc: mesa-stable
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29106>
(cherry picked from commit 568807cf889060fe7c3bd5b9f11ced4d84966790)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_x11.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index b1a0f83f4f4..0db2a69ac6f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -844,7 +844,7 @@ "description": "egl/x11: disable dri3 with LIBGL_KOPPER_DRI2=1 as expected", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 6af987ed7ad..ecee10f47bf 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1518,7 +1518,8 @@ dri2_initialize_x11_swrast(_EGLDisplay *disp) */ dri2_dpy->driver_name = strdup(disp->Options.Zink ? "zink" : "swrast"); if (disp->Options.Zink && - !debug_get_bool_option("LIBGL_DRI3_DISABLE", false)) + !debug_get_bool_option("LIBGL_DRI3_DISABLE", false) && + !debug_get_bool_option("LIBGL_KOPPER_DRI2", false)) dri3_x11_connect(dri2_dpy); if (!dri2_load_driver_swrast(disp)) goto cleanup; |