Mesa (staging/21.2): driconf: disallow 10-bit pbuffers for viewperf2020/maya due to X errors

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 4c68c3615165674666df3950c08293e6ae3efa43
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c68c3615165674666df3950c08293e6ae3efa43

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Oct 21 15:47:18 2021 -0400

driconf: disallow 10-bit pbuffers for viewperf2020/maya due to X errors

Cc: 21.2 21.3 <mesa-stable at lists.freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13472>
(cherry picked from commit 10ee261c38cbb0c7f0637a039ac2ec3a1ca64c5b)

---

 .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 15081198f70..e6110197eca 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -148,7 +148,7 @@
         "description": "driconf: disallow 10-bit pbuffers for viewperf2020/maya due to X errors",
         "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 637d549fbaf..21c616b596c 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -310,6 +310,8 @@ TODO: document the other workarounds.
             <option name="allow_draw_out_of_order" value="true" />
             <option name="mesa_glthread" value="true" />
             <option name="mesa_no_error" value="true" />
+            <!-- Creating 10-bit pbuffers fails in the X server and returns BadAlloc. -->
+            <option name="allow_rgb10_configs" value="false" />
         </application>
 
         <!-- Workaround for unsynchronized VBO updates on Dead Cells android