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

egl/x11: Add a separate dri2_initialize_x11_kopper helper

Browse source 
This further detangles things so we just have a kopper initialization
helper that gets invoked whenever dri2_dpy->kopper is set.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36014>
This commit is contained in:
Faith Ekstrand 2025-07-04 15:57:35 -04:00 • committed by Marge Bot
parent 0729df3ca6
commit 572813d597
1 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/egl/drivers/dri2/platform_x11.c
View file

@ -1194,17 +1194,11 @@ platform_x11_finalize(_EGLDisplay *disp, bool force_zink)
}
static EGLBoolean
dri2_initialize_x11_swrast(_EGLDisplay *disp, bool force_zink)
dri2_initialize_x11_kopper(_EGLDisplay *disp, bool force_zink)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
if (dri2_dpy->kopper) {
dri2_dpy->loader_extensions = kopper_loader_extensions;
} else if (check_xshm(dri2_dpy)) {
dri2_dpy->loader_extensions = swrast_loader_shm_extensions;
} else {
dri2_dpy->loader_extensions = swrast_loader_extensions;
}
dri2_dpy->loader_extensions = kopper_loader_extensions;
if (!platform_x11_finalize(disp, force_zink))
return EGL_FALSE;
@ -1212,10 +1206,29 @@ dri2_initialize_x11_swrast(_EGLDisplay *disp, bool force_zink)
/* Fill vtbl last to prevent accidentally calling virtual function during
* initialization.
*/
if (dri2_dpy->kopper)
dri2_dpy->vtbl = &dri2_x11_kopper_display_vtbl;
else
dri2_dpy->vtbl = &dri2_x11_swrast_display_vtbl;
dri2_dpy->vtbl = &dri2_x11_kopper_display_vtbl;
return EGL_TRUE;
}
static EGLBoolean
dri2_initialize_x11_swrast(_EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
if (check_xshm(dri2_dpy)) {
dri2_dpy->loader_extensions = swrast_loader_shm_extensions;
} else {
dri2_dpy->loader_extensions = swrast_loader_extensions;
}
if (!platform_x11_finalize(disp, false))
return EGL_FALSE;
/* Fill vtbl last to prevent accidentally calling virtual function during
* initialization.
*/
dri2_dpy->vtbl = &dri2_x11_swrast_display_vtbl;
return EGL_TRUE;
}
@ -1302,8 +1315,11 @@ dri2_initialize_x11(_EGLDisplay *disp)
#endif
dri2_detect_swrast(disp);
if (disp->Options.ForceSoftware || dri2_dpy->kopper)
return dri2_initialize_x11_swrast(disp, force_zink);
if (dri2_dpy->kopper)
return dri2_initialize_x11_kopper(disp, force_zink);
if (disp->Options.ForceSoftware)
return dri2_initialize_x11_swrast(disp);
#ifdef HAVE_LIBDRM
if (dri2_initialize_x11_dri3(disp))