chore: Add additional fix needed for Mesa 23.3.4

This commit is contained in:
Kyle Gospodnetich 2024-01-30 00:45:50 -08:00
parent 501d479607
commit 12136b49a1

View File

@ -1,7 +1,7 @@
From 90d0b4fd8cab8d6fa8d92f799073f6022dad9f23 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derek.foreman@collabora.com>
Date: Wed, 20 Sep 2023 10:40:33 -0500
Subject: [PATCH 1/7] vulkan/wsi/wayland: refactor wayland dispatch code
Subject: [PATCH 1/8] vulkan/wsi/wayland: refactor wayland dispatch code
We currently have two similar but different bits of code to dispatch
wayland event queues. Pull out as much common code as possible.
@ -569,7 +569,7 @@ index 5fd9aaf24ae..114337944a9 100644
From c21b55b27dbb7ac0df850fc92740298f1a2f83d8 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derek.foreman@collabora.com>
Date: Fri, 10 Nov 2023 07:25:35 -0600
Subject: [PATCH 2/7] vulkan/wsi/wayland: Use commit_timing/commit_queue
Subject: [PATCH 2/8] vulkan/wsi/wayland: Use commit_timing/commit_queue
protocol for FIFO
The commit_timing protocol allows us to set a presentation timestamp,
@ -907,7 +907,7 @@ index 114337944a9..5b2eec168e0 100644
From 136846b41c96c68415b4541fd8ead392b4b44790 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Sat, 25 Nov 2023 16:25:58 +0100
Subject: [PATCH 3/7] hack: rip out commit-timing-v1
Subject: [PATCH 3/8] hack: rip out commit-timing-v1
---
src/egl/wayland/wayland-drm/meson.build | 2 +-
@ -1048,7 +1048,7 @@ index 5b2eec168e0..953be5e1e85 100644
From 829608aeae5a8db0f8aab820791df2629830b23b Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Wed, 29 Nov 2023 11:06:51 +0000
Subject: [PATCH 4/7] wsi: Use vendored gamescope-commit-queue-v1 protocol
Subject: [PATCH 4/8] wsi: Use vendored gamescope-commit-queue-v1 protocol
---
.../wayland-drm/gamescope-commit-queue-v1.xml | 181 ++++++++++++++++++
@ -1392,7 +1392,7 @@ index 953be5e1e85..30ff69ae223 100644
From 04afaf13b208f5c58c0b057f3dfc2dfa5c19a334 Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Fri, 14 Jan 2022 15:58:45 +0100
Subject: [PATCH 5/7] STEAMOS: radv: min image count override for FH5
Subject: [PATCH 5/8] STEAMOS: radv: min image count override for FH5
Otherwise in combination with the vblank time reservation in
gamescope the game could get stuck in low power states.
@ -1421,7 +1421,7 @@ index 1cbb2e087c9..43488ada6bc 100644
From b1c0d3de07bf958317f386585ce541b1c336e929 Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Mon, 21 Feb 2022 18:43:54 +0100
Subject: [PATCH 6/7] STEAMOS: Dynamic swapchain override for gamescope limiter
Subject: [PATCH 6/8] STEAMOS: Dynamic swapchain override for gamescope limiter
---
src/loader/loader_dri3_helper.c | 42 +++++++++++++++++++++++++++++++--
@ -1622,7 +1622,7 @@ index cba1d1c5e7c..6d66387d5be 100644
From 12cf7ebfcb7e47c1e5d99fe2d2c0b83a03bfa6cb Mon Sep 17 00:00:00 2001
From: Friedrich Vock <friedrich.vock@gmx.de>
Date: Fri, 1 Dec 2023 15:18:44 +0100
Subject: [PATCH 7/7] radv: Enable compute dispatch tunneling
Subject: [PATCH 7/8] radv: Enable compute dispatch tunneling
Compute tunneling can considerably lower the latency of high-priority
compute work. Enabling it is beneficial in cases where high-priority
@ -1669,3 +1669,31 @@ index 86a3c4c4571..eaa88b426d1 100644
--
2.42.0
From fbb5d9e6c4cb7a9b383b4b1ae104ebc1ba52b8bd Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Tue, 30 Jan 2024 00:44:58 -0800
Subject: [PATCH 8/8] bazzite: Fix unneeded condition
---
src/vulkan/wsi/wsi_common_wayland.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
index 30ff69ae223..37b226a3993 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -2496,10 +2496,6 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
chain->queue = wl_display_create_queue(chain->wsi_wl_surface->display->wl_display);
if (chain->wsi_wl_surface->display->wp_presentation_notwrapped) {
- if (!wsi_init_pthread_cond_monotonic(&chain->present_ids.list_advanced)) {
- result = VK_ERROR_OUT_OF_HOST_MEMORY;
- goto fail_free_wl_chain;
- }
pthread_mutex_init(&chain->present_ids.lock, NULL);
wl_list_init(&chain->present_ids.outstanding_list);
--
2.42.0