fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 06:20:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/wsi/x11: detect Xwayland via the XWAYLAND extension

Browse source 
This is more robust than checking for XRandR output names.

Signed-off-by: Simon Ser <contact@emersion.fr>
References: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/954
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17790>
This commit is contained in:
Simon Ser 2022-07-28 14:54:56 +02:00
parent 87182ba977
commit 137b34a67e
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vulkan/wsi/wsi_common_x11.c
View file

@ -141,8 +141,18 @@ wsi_x11_check_dri3_compatible(const struct wsi_device *wsi_dev,
}
static bool
wsi_x11_detect_xwayland(xcb_connection_t *conn)
wsi_x11_detect_xwayland(xcb_connection_t *conn,
xcb_query_extension_reply_t *randr_reply,
xcb_query_extension_reply_t *xwl_reply)
{
/* Newer Xwayland exposes an X11 extension we can check for */
if (xwl_reply && xwl_reply->present)
return true;
/* Older Xwayland uses the word "XWAYLAND" in the RandR output names */
if (!randr_reply || !randr_reply->present)
return false;
xcb_randr_query_version_cookie_t ver_cookie =
xcb_randr_query_version_unchecked(conn, 1, 3);
xcb_randr_query_version_reply_t *ver_reply =
@ -192,10 +202,10 @@ wsi_x11_connection_create(struct wsi_device *wsi_dev,
{
xcb_query_extension_cookie_t dri3_cookie, pres_cookie, randr_cookie,
amd_cookie, nv_cookie, shm_cookie, sync_cookie,
xfixes_cookie;
xfixes_cookie, xwl_cookie;
xcb_query_extension_reply_t *dri3_reply, *pres_reply, *randr_reply,
*amd_reply, *nv_reply, *shm_reply = NULL,
*xfixes_reply;
*xfixes_reply, *xwl_reply;
bool wants_shm = wsi_dev->sw && !(WSI_DEBUG & WSI_DEBUG_NOSHM) &&
wsi_dev->has_import_memory_host;
bool has_dri3_v1_2 = false;
@ -212,6 +222,7 @@ wsi_x11_connection_create(struct wsi_device *wsi_dev,
pres_cookie = xcb_query_extension(conn, 7, "Present");
randr_cookie = xcb_query_extension(conn, 5, "RANDR");
xfixes_cookie = xcb_query_extension(conn, 6, "XFIXES");
xwl_cookie = xcb_query_extension(conn, 8, "XWAYLAND");
if (wants_shm)
shm_cookie = xcb_query_extension(conn, 7, "MIT-SHM");
@ -235,12 +246,14 @@ wsi_x11_connection_create(struct wsi_device *wsi_dev,
amd_reply = xcb_query_extension_reply(conn, amd_cookie, NULL);
nv_reply = xcb_query_extension_reply(conn, nv_cookie, NULL);
xfixes_reply = xcb_query_extension_reply(conn, xfixes_cookie, NULL);
xwl_reply = xcb_query_extension_reply(conn, xwl_cookie, NULL);
if (wants_shm)
shm_reply = xcb_query_extension_reply(conn, shm_cookie, NULL);
if (!dri3_reply || !pres_reply || !xfixes_reply) {
free(dri3_reply);
free(pres_reply);
free(xfixes_reply);
free(xwl_reply);
free(randr_reply);
free(amd_reply);
free(nv_reply);
@ -289,10 +302,8 @@ wsi_x11_connection_create(struct wsi_device *wsi_dev,
free(ver_reply);
}
if (randr_reply && randr_reply->present != 0)
wsi_conn->is_xwayland = wsi_x11_detect_xwayland(conn);
else
wsi_conn->is_xwayland = false;
wsi_conn->is_xwayland = wsi_x11_detect_xwayland(conn, randr_reply,
xwl_reply);
wsi_conn->has_dri3_modifiers = has_dri3_v1_2 && has_present_v1_2;
wsi_conn->is_proprietary_x11 = false;
@ -329,6 +340,7 @@ wsi_x11_connection_create(struct wsi_device *wsi_dev,
free(dri3_reply);
free(pres_reply);
free(randr_reply);
free(xwl_reply);
free(amd_reply);
free(nv_reply);
if (wants_shm)