From 15e6d8b8d22bc981d86c29469a1fce9797afe31f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 12 Apr 2024 13:38:02 +1000 Subject: [PATCH] egl/dri2: don't bind dri2 for zink I'm not sure why zink would want dri2 here instead of kopper, I'm sure it's some side effect of something else, let zink use the kopper paths. This fixes: dEQP-GL45-ES3.info.vendor on zink on nvk with GL cts using EGL. Reviewed-by: Mike Blumenkrantz Fixes: 12a47b84b738 ("egl/dri2: trigger drawable invalidation from surface queries for zink") Part-of: (cherry picked from commit 223aedfa5dba263101a91314186be80861dbd3cf) --- .pick_status.json | 2 +- src/egl/drivers/dri2/egl_dri2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3d62e92d84f..4db7cfabb7d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3634,7 +3634,7 @@ "description": "egl/dri2: don't bind dri2 for zink", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "12a47b84b7386e1aac6c4b0d36ad198705432378", "notes": null diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 988a655d82b..b884a0e887f 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1046,7 +1046,7 @@ dri2_setup_extensions(_EGLDisplay *disp) extensions = dri2_dpy->core->getExtensions(dri2_dpy->dri_screen_render_gpu); - if (dri2_dpy->image_driver || dri2_dpy->dri2 || disp->Options.Zink) { + if (dri2_dpy->image_driver || dri2_dpy->dri2) { if (!loader_bind_extensions(dri2_dpy, dri2_core_extensions, ARRAY_SIZE(dri2_core_extensions), extensions)) return EGL_FALSE;