driconf: Eliminate the DRI_CONF_OPT_BEGIN_B macro.
Since the nested-sections rework, this use in the testcase was the only
remaining one.
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6916>
diff --git a/src/util/driconf.h b/src/util/driconf.h
index 3a58a3a..f1e41f9 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -73,13 +73,6 @@
#define DRI_CONF_OPT_BEGIN(name,type,def) \
"<option name=\""#name"\" type=\""#type"\" default=\""#def"\">\n"
-/**
- * \brief Begin a boolean option definition, with the default value passed in
- * as a string
- */
-#define DRI_CONF_OPT_BEGIN_B(name,def) \
-"<option name=\""#name"\" type=\"bool\" default="#def">\n"
-
/** \brief Begin an option definition with restrictions on valid values */
#define DRI_CONF_OPT_BEGIN_V(name,type,def,valid) \
"<option name=\""#name"\" type=\""#type"\" default=\""#def"\" valid=\"" valid "\">\n"
@@ -115,8 +108,12 @@
options \
DRI_CONF_SECTION_END
+/**
+ * \brief A boolean option definition, with the default value passed in as a
+ * string
+ */
#define DRI_CONF_OPT_B(name, def, desc) \
- DRI_CONF_OPT_BEGIN_B(name, def) \
+ "<option name=\""#name"\" type=\"bool\" default="#def">\n" \
DRI_CONF_DESC(desc) \
DRI_CONF_OPT_END
diff --git a/src/util/tests/xmlconfig.cpp b/src/util/tests/xmlconfig.cpp
index ff11225..a5a0f49 100644
--- a/src/util/tests/xmlconfig.cpp
+++ b/src/util/tests/xmlconfig.cpp
@@ -122,8 +122,7 @@
TEST_F(xmlconfig_test, copy_cache)
{
driconf(DRI_CONF_TEST_OPT(
- DRI_CONF_OPT_BEGIN_B(mesa_b_option, "true")
- DRI_CONF_OPT_END
+ DRI_CONF_OPT_B(mesa_b_option, "true", "description")
DRI_CONF_OPT_BEGIN(mesa_s_option, string, value)
DRI_CONF_DESC("option")
DRI_CONF_OPT_END));
