diff --git a/anda/lib/mesa/mesa-38987.patch b/anda/lib/mesa/mesa-38987.patch deleted file mode 100644 index 49b89b031a..0000000000 --- a/anda/lib/mesa/mesa-38987.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3dbbff571f31899e47ec4a002f3ecbe96cc48981 Mon Sep 17 00:00:00 2001 -From: Yuxuan Shui -Date: Wed, 17 Dec 2025 08:14:24 +0000 -Subject: [PATCH] wsi/display: Set atomic client cap in AcquireDrmDisplayEXT as - well. - -Previously we only added the atomic client cap to the drmFd passed to -GetDrmDisplayEXT (through wsi_display_get_connector). But the drmFd -passed to AcquireDrmDisplayEXT might be different. And that drmFd is -what mesa will use for later operations. - -For example, SteamVR uses a non-master drm fd for GetDrmDisplayEXT, then -later uses a different, leased drm fd for AcquireDrmDisplayEXT. This -breaks things like drmModeObjectGetProperties because all atomic -properties will be missing. - -Fixes: 513ffea1d366 ("wsi/display: use atomic mode setting") -Signed-off-by: Yuxuan Shui ---- - src/vulkan/wsi/wsi_common_display.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/vulkan/wsi/wsi_common_display.c b/src/vulkan/wsi/wsi_common_display.c -index 4c9451a6d000f..8b004563ff44e 100644 ---- a/src/vulkan/wsi/wsi_common_display.c -+++ b/src/vulkan/wsi/wsi_common_display.c -@@ -4074,6 +4074,7 @@ wsi_AcquireDrmDisplayEXT(VkPhysicalDevice physicalDevice, - - drmModeFreeConnector(drm_connector); - -+ drmSetClientCap(drmFd, DRM_CLIENT_CAP_ATOMIC, 1); - wsi->fd = drmFd; - return VK_SUCCESS; - } --- -GitLab - diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 2fe7c7a20f..4877b9b228 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -82,7 +82,7 @@ Name: %{srcname} Summary: Mesa graphics libraries -%global ver 25.3.1 +%global ver 25.3.3 Epoch: 1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 2 @@ -116,9 +116,6 @@ Source15: https://crates.io/api/v1/crates/rustc-hash/%{rustc_hash_ver}/dow # Teflon: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38532 Patch12: mesa-38532.patch -# SteamVR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38987 -Patch20: mesa-38987.patch - # Add required patches for Wine Wayland (From Proton-GE Release Notes) Patch21: wine-wayland.patch diff --git a/anda/lib/mesa/wine-wayland.patch b/anda/lib/mesa/wine-wayland.patch index d212c801f0..85764678a0 100644 --- a/anda/lib/mesa/wine-wayland.patch +++ b/anda/lib/mesa/wine-wayland.patch @@ -1,5 +1,5 @@ diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c -index c43b8f9a00c..fb0db9769e6 100644 +index 5cbfc6f344a..622406fee25 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -154,7 +154,7 @@ static const struct debug_control trace_options[] = { @@ -38,7 +38,7 @@ index 05ffad6424d..e32862161de 100644 DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) DRI_CONF_VK_XWAYLAND_WAIT_READY(false) diff --git a/src/intel/vulkan/anv_instance.c b/src/intel/vulkan/anv_instance.c -index a6f2c5985c0..b509fa21404 100644 +index 7967313f1f5..96cc0b5707e 100644 --- a/src/intel/vulkan/anv_instance.c +++ b/src/intel/vulkan/anv_instance.c @@ -10,7 +10,7 @@ @@ -90,10 +90,10 @@ index bb425414bb1..39f137d5ab3 100644 DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) DRI_CONF_VK_XWAYLAND_WAIT_READY(false) diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf -index 926db52670e..78c6934b829 100644 +index 1dc9d17af82..ce4d7d3399d 100644 --- a/src/util/00-mesa-defaults.conf +++ b/src/util/00-mesa-defaults.conf -@@ -645,24 +645,24 @@ TODO: document the other workarounds. +@@ -649,24 +649,24 @@ TODO: document the other workarounds. -@@ -723,10 +723,12 @@ TODO: document the other workarounds. +@@ -727,10 +727,12 @@ TODO: document the other workarounds.