driconf: add override for Xwayland

zink needs this to avoid deadlocking on startup

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14541>

diff --git a/src/gallium/drivers/zink/driinfo_zink.h b/src/gallium/drivers/zink/driinfo_zink.h
index e1cf6d7d559619e2fb0a311234432f77cdb3ea6e..9687285060c9b50ee75e13603f06719fe885ebeb 100644 (file)
--- a/src/gallium/drivers/zink/driinfo_zink.h
+++ b/src/gallium/drivers/zink/driinfo_zink.h
@@ -3,6 +3,8 @@
 DRI_CONF_SECTION_DEBUG
    DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION(false)
    DRI_CONF_OPT_B(radeonsi_inline_uniforms, false, "Optimize shaders by replacing uniforms with literals")
+   DRI_CONF_OPT_B(disable_xcb_surface, false, \
+                  "disable ext")
 DRI_CONF_SECTION_END
 
 DRI_CONF_SECTION_PERFORMANCE

diff --git a/src/gallium/drivers/zink/zink_instance.py b/src/gallium/drivers/zink/zink_instance.py
index 20002c4727beeda03cfcac5f58e58070088f7c58..632cf3c4bfcc42d9774ef235e2034ee24719b116 100644 (file)
--- a/src/gallium/drivers/zink/zink_instance.py
+++ b/src/gallium/drivers/zink/zink_instance.py
@@ -43,7 +43,8 @@ EXTENSIONS = [
     Extension("VK_KHR_surface"),
     Extension("VK_EXT_headless_surface"),
     Extension("VK_KHR_wayland_surface"),
-    Extension("VK_KHR_xcb_surface"),
+    Extension("VK_KHR_xcb_surface",
+              conditions=["!instance_info->disable_xcb_surface"]),
 ]
 
 # constructor: Layer(name, conditions=[])
@@ -73,10 +74,12 @@ header_code = """
 #include "MoltenVK/vk_mvk_moltenvk.h"
 #endif
 
+struct pipe_screen;
 struct zink_screen;
 
 struct zink_instance_info {
    uint32_t loader_version;
+   bool disable_xcb_surface;
 
 %for ext in extensions:
    bool have_${ext.name_with_vendor()};

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index eb8df6b66a681e2b23e04cc5c00c53dc886794c2..a5e2f1010d251c901cf1efcbc4a2fdca95e28760 100644 (file)
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -2113,6 +2113,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
                           NULL, NULL, NULL, 0, NULL, 0);
       screen->driconf.dual_color_blend_by_location = driQueryOptionb(config->options, "dual_color_blend_by_location");
       //screen->driconf.inline_uniforms = driQueryOptionb(config->options, "radeonsi_inline_uniforms");
+      screen->instance_info.disable_xcb_surface = driQueryOptionb(config->options, "disable_xcb_surface");
    }
 #endif
    screen->instance = zink_create_instance(&screen->instance_info);

diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 1d44381b697ed355d3857a1d70e45cb51f9d4e10..59de17e2110b7685bce7fb48c34f77f30925887b 100644 (file)
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -70,6 +70,11 @@ TODO: document the other workarounds.
             <option name="disable_arb_gpu_shader5" value="true" />
         </application>
 
+        <!-- using vulkan wsi for xservers causes deadlocks -->
+        <application name="Xwayland" executable="Xwayland">
+            <option name="disable_xcb_surface" value="true" />
+        </application>
+
         <application name="Unigine Heaven (32-bit)" executable="heaven_x86">
             <option name="allow_glsl_extension_directive_midshader" value="true" />
             <!-- remove dual_color_blend_by_location if 4.1 ever comes out -->