From 0d6238b6abca78a244e312813b5e57c06ad02f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Mon, 9 Dec 2024 14:50:57 +0200
Subject: [PATCH] drirc/anv: force_vk_vendor=-1 for Marvel Rivals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12280
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
(cherry picked from commit 03c9f164e80fa1b76d4735c35def1aec953a6eb8)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32730>
---
 .pick_status.json              | 2 +-
 src/util/00-mesa-defaults.conf | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 81b52717e84..9d3e6a94573 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -954,7 +954,7 @@
         "description": "drirc/anv: force_vk_vendor=-1 for Marvel Rivals",
         "nominated": true,
         "nomination_type": 1,
-        "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 39712cef38b..4067960d347 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1269,6 +1269,9 @@ TODO: document the other workarounds.
         <application name="Silent Hill 2" executable="SHProto-Win64-Shipping.exe">
             <option name="force_vk_vendor" value="-1" />
         </application>
+        <application name="Marvel Rivals" executable="Marvel-Win64-Shipping.exe">
+            <option name="force_vk_vendor" value="-1" />
+        </application>
         <application name="DIRT 5" executable="DIRT5.exe">
             <option name="fp64_workaround_enabled" value="true" />
         </application>