fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

egl/dri2: don't bind dri2 for zink

Browse source 
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 <michael.blumenkrantz@gmail.com>
Fixes: 12a47b84b7 ("egl/dri2: trigger drawable invalidation from surface queries for zink")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28707>
(cherry picked from commit 223aedfa5d)
This commit is contained in:
Dave Airlie 2024-04-12 13:38:02 +10:00 • committed by Eric Engestrom
parent 431c00e39d
commit 15e6d8b8d2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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

2
src/egl/drivers/dri2/egl_dri2.c
View file

@ -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;