Mesa (staging/20.2): driconf: fix force_gl_vendor description

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: f3c3a1cefff8a4c0a233fe801559ece0fc70a295
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3c3a1cefff8a4c0a233fe801559ece0fc70a295

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/driconf.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8fb0a151a93..bc1a3744a4a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -445,7 +445,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/driconf.h b/src/util/driconf.h
index 909768c1c32..c922e94b9f9 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -214,7 +214,7 @@ DRI_CONF_OPT_END
 
 #define DRI_CONF_FORCE_GL_VENDOR(def) \
 DRI_CONF_OPT_BEGIN(force_gl_vendor, string, def) \
-        DRI_CONF_DESC("Allow GPU vendor to be overridden.") \
+        DRI_CONF_DESC("Override GPU vendor string.") \
 DRI_CONF_OPT_END
 
 #define DRI_CONF_FORCE_COMPAT_PROFILE(def) \