diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 18d2ba6a152..05103c620a4 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1305,7 +1305,7 @@ dri2_initialize_x11(_EGLDisplay *disp) * We're going to enable Zink anyway. */ if (!force_zink) { - bool status = dri3_x11_connect(dri2_dpy, disp->Options.Zink, disp->Options.ForceSoftware); + bool status = dri3_x11_connect(dri2_dpy, disp->Options.ForceSoftware); /* the status here is ignored for zink-with-kopper and swrast, * otherwise return whatever error/fallback status as failure */ diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c index 28a91b5f04d..e69244bd8a9 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.c +++ b/src/egl/drivers/dri2/platform_x11_dri3.c @@ -522,7 +522,7 @@ struct dri2_egl_display_vtbl dri3_x11_display_vtbl = { }; bool -dri3_x11_connect(struct dri2_egl_display *dri2_dpy, bool zink, bool swrast) +dri3_x11_connect(struct dri2_egl_display *dri2_dpy, bool swrast) { dri2_dpy->fd_render_gpu = x11_dri3_open(dri2_dpy->conn, dri2_dpy->screen->root, 0); @@ -544,12 +544,6 @@ dri3_x11_connect(struct dri2_egl_display *dri2_dpy, bool zink, bool swrast) if (!dri2_dpy->driver_name) dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd_render_gpu); - if (!zink && !strcmp(dri2_dpy->driver_name, "zink")) { - close(dri2_dpy->fd_render_gpu); - dri2_dpy->fd_render_gpu = -1; - return false; - } - if (!dri2_dpy->driver_name) { _eglLog(_EGL_WARNING, "DRI3: No driver found"); close(dri2_dpy->fd_render_gpu); diff --git a/src/egl/drivers/dri2/platform_x11_dri3.h b/src/egl/drivers/dri2/platform_x11_dri3.h index e8120efb254..c487188212e 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.h +++ b/src/egl/drivers/dri2/platform_x11_dri3.h @@ -36,6 +36,6 @@ extern const __DRIimageLoaderExtension dri3_image_loader_extension; extern struct dri2_egl_display_vtbl dri3_x11_display_vtbl; bool -dri3_x11_connect(struct dri2_egl_display *dri2_dpy, bool zink, bool swrast); +dri3_x11_connect(struct dri2_egl_display *dri2_dpy, bool swrast); #endif