From 179ad03f5d56ce5b84f81edbe7ca3af752cdac18 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Thu, 23 Jun 2022 11:50:29 +1000
Subject: [PATCH] util: use force_gl_map_buffer_synchronized workaround with
 RAGE

CC: 22.1 22.0 <mesa-stable>

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1326
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17199>
(cherry picked from commit e060d98aac588247f195988b58c2dcb04fef4bb8)
---
 .pick_status.json              | 2 +-
 src/util/00-mesa-defaults.conf | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 043c4dd0297..7171a3f992b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -256,7 +256,7 @@
         "description": "util: use force_gl_map_buffer_synchronized workaround with RAGE",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 917904a09a9..92f9df726ea 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -159,10 +159,12 @@ TODO: document the other workarounds.
 
         <application name="RAGE (64-bit)" executable="Rage64.exe">
             <option name="allow_glsl_builtin_variable_redeclaration" value="true" />
+            <option name="force_gl_map_buffer_synchronized" value="true" />
         </application>
 
         <application name="RAGE (32-bit)" executable="Rage.exe">
             <option name="allow_glsl_builtin_variable_redeclaration" value="true" />
+            <option name="force_gl_map_buffer_synchronized" value="true" />
         </application>
 
         <application name="Second Life" executable="do-not-directly-run-secondlife-bin">