From 17e7be7c791a634eac94f3334ec99fda18cc5af6 Mon Sep 17 00:00:00 2001
From: Ryan Neph <ryanneph@google.com>
Date: Wed, 21 Oct 2020 00:47:04 +0000
Subject: [PATCH] virgl: Fixes portal2 binary name in tweak config

Portal 2 on virgl w/ GLES host requires bgraswz and emubgra tweaks.
Application binary name matching mismatch caused tweaks to default
to a disabled state.

Signed-off-by: Ryan Neph <ryanneph@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Fixes: 9760a7ed913 ("virgl: apply bgra dest swizzle and add Portal 2")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7246>
(cherry picked from commit b2c737cf57382d543002177b6e4810b19ab62c74)
---
 .pick_status.json              | 2 +-
 src/util/00-mesa-defaults.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 359fb520f56..01c93f46b03 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -103,7 +103,7 @@
         "description": "virgl: Fixes portal2 binary name in tweak config",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "9760a7ed9138b84d83a712afeb0e673399d9e200"
     },
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index c56990353c1..00888a154e9 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -689,7 +689,7 @@ TODO: document the other workarounds.
             <option name="gles_emulate_bgra" value="true" />
             <option name="gles_apply_bgra_dest_swizzle" value="true"/>
         </application>
-        <application name="Portal 2" executable="hl2_linux">
+        <application name="Portal 2" executable="portal2_linux">
             <option name="gles_emulate_bgra" value="true" />
             <option name="gles_apply_bgra_dest_swizzle" value="true"/>
         </application>