Module: Mesa Branch: staging/21.3 Commit: ac25873e2a64c42449d0f7cd1b8a5ee83694b762 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac25873e2a64c42449d0f7cd1b8a5ee83694b762
Author: Marek Olšák <[email protected]> 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 <[email protected]> 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 c3c95776da3..ad4cd59b598 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -850,7 +850,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 f320952712c..b9704cd26a0 100644 --- a/src/util/00-mesa-defaults.conf +++ b/src/util/00-mesa-defaults.conf @@ -309,6 +309,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
