From 8c5fafef1d202f9b9f4a3c3ef0710b318f2fe32e Mon Sep 17 00:00:00 2001
From: Blisto <42647-Blisto@users.noreply.gitlab.freedesktop.org>
Date: Wed, 17 Jan 2024 17:00:24 +0000
Subject: [PATCH] driconf: set vk_x11_strict_image_count for Atlas Fallen
 Vulkan

Prevents crash with vsync turned off on xwayland.

Cc: mesa-stable
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27122>
(cherry picked from commit 3bc6f95e3d175a1c20cad4de4f5c31ff1f102a28)
---
 .pick_status.json              | 2 +-
 src/util/00-mesa-defaults.conf | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 30c62fd4c16..8d7b0139777 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1394,7 +1394,7 @@
         "description": "driconf: set vk_x11_strict_image_count for Atlas Fallen Vulkan",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 5de7570e2b3..2e1234f66fc 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -939,6 +939,11 @@ TODO: document the other workarounds.
             <option name="vk_dont_care_as_load" value="true" />
         </application>
 
+        <!-- Atlas Fallen Vulkan crashes with vsync turned off on xwayland without this workaround. -->
+        <application name="Atlas Fallen" executable="AtlasFallen (VK).exe">
+            <option name="vk_x11_strict_image_count" value="true" />
+        </application>
+
         <!-- Disable fp16 support for browsers, since there is too much
              broken WebGL out there that uses the wrong precision.
              Bonus workaround for Firefox bug #1845309. -->