Mesa (master): driconf: Remove default values from string driconf entries

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3b44d481e49d0f82b453436fecdefc3e826a2aca
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b44d481e49d0f82b453436fecdefc3e826a2aca

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Sat Apr 10 12:24:05 2021 -0700

driconf: Remove default values from string driconf entries

None of the call sites pass a string here, which produces warnings
for MSVC, for not passing an argument to a macro which requires it.

Looks like GCC/clang stringize an unpassed argument to ""

Acked-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10157>

---

 src/util/driconf.h | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/util/driconf.h b/src/util/driconf.h
index 48be630d0e2..5467c150d31 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -118,6 +118,15 @@
       .value = { ._string = #def },                             \
    },
 
+#define DRI_CONF_OPT_S_NODEF(_name, _desc) {                    \
+      .desc = _desc,                                            \
+      .info = {                                                 \
+         .name = #_name,                                        \
+         .type = DRI_STRING,                                    \
+      },                                                        \
+      .value = { ._string = "" },                               \
+   },
+
 /**
  * \brief Debugging options
  */
@@ -207,8 +216,8 @@
    DRI_CONF_OPT_B(allow_incorrect_primitive_id, def, \
                   "Allows drawing display list using merged draws (might cause invalid gl_PrimitiveID values).")
 
-#define DRI_CONF_FORCE_GL_VENDOR(def) \
-   DRI_CONF_OPT_S(force_gl_vendor, def, "Override GPU vendor string.")
+#define DRI_CONF_FORCE_GL_VENDOR() \
+   DRI_CONF_OPT_S_NODEF(force_gl_vendor, "Override GPU vendor string.")
 
 #define DRI_CONF_FORCE_COMPAT_PROFILE(def) \
    DRI_CONF_OPT_B(force_compat_profile, def, \
@@ -224,12 +233,12 @@
 #define DRI_CONF_TRANSCODE_ETC(def) \
    DRI_CONF_OPT_B(transcode_etc, def, "Transcode ETC formats to DXTC if unsupported")
 
-#define DRI_CONF_GLX_EXTENSION_OVERRIDE(def) \
-   DRI_CONF_OPT_S(glx_extension_override, def, \
+#define DRI_CONF_GLX_EXTENSION_OVERRIDE() \
+   DRI_CONF_OPT_S_NODEF(glx_extension_override, \
                   "Allow enabling/disabling a list of GLX extensions")
 
-#define DRI_CONF_INDIRECT_GL_EXTENSION_OVERRIDE(def) \
-   DRI_CONF_OPT_S(indirect_gl_extension_override, def, \
+#define DRI_CONF_INDIRECT_GL_EXTENSION_OVERRIDE() \
+   DRI_CONF_OPT_S_NODEF(indirect_gl_extension_override, \
                   "Allow enabling/disabling a list of indirect-GL extensions")
 
 #define DRI_CONF_DISABLE_PROTECTED_CONTENT_CHECK(def) \
@@ -361,11 +370,11 @@
  */
 #define DRI_CONF_SECTION_INITIALIZATION DRI_CONF_SECTION("Initialization")
 
-#define DRI_CONF_DEVICE_ID_PATH_TAG(def) \
-   DRI_CONF_OPT_S(device_id, def, "Define the graphic device to use if possible")
+#define DRI_CONF_DEVICE_ID_PATH_TAG() \
+   DRI_CONF_OPT_S_NODEF(device_id, "Define the graphic device to use if possible")
 
-#define DRI_CONF_DRI_DRIVER(def) \
-   DRI_CONF_OPT_S(dri_driver, def, "Override the DRI driver to load")
+#define DRI_CONF_DRI_DRIVER() \
+   DRI_CONF_OPT_S_NODEF(dri_driver, "Override the DRI driver to load")
 
 /**
  * \brief Gallium-Nine specific configuration options