Mesa (staging/20.1): driconf: fix force_gl_vendor description
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Aug 12 13:08:34 UTC 2020
Module: Mesa
Branch: staging/20.1
Commit: c235ed07a2ce93b7677d9a9de0dca1aebdfcb442
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c235ed07a2ce93b7677d9a9de0dca1aebdfcb442
Author: Eric Engestrom <eric at engestrom.ch>
Date: Thu Aug 6 16:05:51 2020 +0200
driconf: fix force_gl_vendor description
The option is not a toggle to "allow GPU vendor to be overridden", it
*is* the override.
Fixes: dca119f12c291d7665d7 ("mesa/gallium: add dric option to allow overriding GL vendor string")
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6207>
(cherry picked from commit 7fbadfc385c359fd291d58a75fbe6ce3fdc91747)
---
.pick_status.json | 2 +-
src/util/xmlpool/t_options.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 37f28d5cd1a..49fad34479c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -616,7 +616,7 @@
"description": "driconf: fix force_gl_vendor description",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "dca119f12c291d7665d72464c92a8bf4328ef38e"
},
diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h
index b86aefa77ef..e7462faec08 100644
--- a/src/util/xmlpool/t_options.h
+++ b/src/util/xmlpool/t_options.h
@@ -152,7 +152,7 @@ DRI_CONF_OPT_END
#define DRI_CONF_FORCE_GL_VENDOR(def) \
DRI_CONF_OPT_BEGIN(force_gl_vendor, string, def) \
- DRI_CONF_DESC(en,gettext("Allow GPU vendor to be overridden.")) \
+ DRI_CONF_DESC(en,gettext("Override GPU vendor string.")) \
DRI_CONF_OPT_END
#define DRI_CONF_FORCE_COMPAT_PROFILE(def) \
More information about the mesa-commit
mailing list