Mesa (staging/21.1): util: disable glthread in CSGO
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon May 3 19:59:54 UTC 2021
Module: Mesa
Branch: staging/21.1
Commit: be5cc7cdd9e03aeb9e58c947875aa9be1a42a57f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=be5cc7cdd9e03aeb9e58c947875aa9be1a42a57f
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Fri Apr 30 16:05:23 2021 +1000
util: disable glthread in CSGO
Users have reported a rise in trust factor problems [1] since using
mesa builds containing 6f2017205e62. Until we confirm its not a problem
disable glthread.
[1] https://github.com/ValveSoftware/csgo-osx-linux/issues/2630
Fixes: 6f2017205e62 ("dri: enable glthread + radeonsi workaround for CS:GO")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4710
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10540>
(cherry picked from commit 40c93e2f455d788cc920f395b899e70f730cf5a3)
---
.pick_status.json | 2 +-
src/util/00-mesa-defaults.conf | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index d69e2aafecf..d7838c13ba2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -364,7 +364,7 @@
"description": "util: disable glthread in CSGO",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "6f2017205e62402b7b2e340620e39cb71730c565"
},
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 2b6511f0ffb..7e48cff109d 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -669,7 +669,6 @@ TODO: document the other workarounds.
<option name="radeonsi_zerovram" value="true" />
</application>
<application name="Counter-Strike Global Offensive" executable="csgo_linux64">
- <option name="mesa_glthread" value="true" />
<option name="radeonsi_zerovram" value="true" />
<option name="radeonsi_clamp_div_by_zero" value="true" />
</application>
More information about the mesa-commit
mailing list