fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 08:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wsi/x11: Use get_screen_resources_current in wsi_x11_detect_xwayland

Browse source 
get_screen_resources may trigger an active probe of display connections
in the X server, which may take significant time and/or result in log
file spam.

Fixes: b5268d532a "wsi/x11: Detect Xwayland"
Reported-by: Sylvain Bertrand <sylvain.bertrand@legeek.net>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8492>
This commit is contained in:
Michel Dänzer 2021-01-14 13:04:57 +01:00 • committed by Marge Bot
parent b06f3c52bf
commit 23f2e77710
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,30 +120,31 @@ static bool
wsi_x11_detect_xwayland(xcb_connection_t *conn)
{
xcb_randr_query_version_cookie_t ver_cookie =
xcb_randr_query_version_unchecked(conn, 1, 2);
xcb_randr_query_version_unchecked(conn, 1, 3);
xcb_randr_query_version_reply_t *ver_reply =
xcb_randr_query_version_reply(conn, ver_cookie, NULL);
bool has_randr_v1_2 = ver_reply && (ver_reply->major_version > 1 ||
ver_reply->minor_version >= 2);
bool has_randr_v1_3 = ver_reply && (ver_reply->major_version > 1 ||
ver_reply->minor_version >= 3);
free(ver_reply);
if (!has_randr_v1_2)
if (!has_randr_v1_3)
return false;
const xcb_setup_t *setup = xcb_get_setup(conn);
xcb_screen_iterator_t iter = xcb_setup_roots_iterator(setup);
xcb_randr_get_screen_resources_cookie_t gsr_cookie =
xcb_randr_get_screen_resources_unchecked(conn, iter.data->root);
xcb_randr_get_screen_resources_reply_t *gsr_reply =
xcb_randr_get_screen_resources_reply(conn, gsr_cookie, NULL);
xcb_randr_get_screen_resources_current_cookie_t gsr_cookie =
xcb_randr_get_screen_resources_current_unchecked(conn, iter.data->root);
xcb_randr_get_screen_resources_current_reply_t *gsr_reply =
xcb_randr_get_screen_resources_current_reply(conn, gsr_cookie, NULL);
if (!gsr_reply || gsr_reply->num_outputs == 0) {
free(gsr_reply);
return false;
}
xcb_randr_output_t *randr_outputs = xcb_randr_get_screen_resources_outputs(gsr_reply);
xcb_randr_output_t *randr_outputs =
xcb_randr_get_screen_resources_current_outputs(gsr_reply);
xcb_randr_get_output_info_cookie_t goi_cookie =
xcb_randr_get_output_info(conn, randr_outputs[0], gsr_reply->config_timestamp);
free(gsr_reply);