From b1e730b3b437801f241c19c645b324cda70d3c5c Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 25 Sep 2020 15:06:11 -0700
Subject: [PATCH] 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>
---
 src/util/driconf.h           | 13 +++++--------
 src/util/tests/xmlconfig.cpp |  3 +--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/util/driconf.h b/src/util/driconf.h
index 3a58a3a768e..f1e41f91831 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 ff1122507a4..a5a0f49f9a5 100644
--- a/src/util/tests/xmlconfig.cpp
+++ b/src/util/tests/xmlconfig.cpp
@@ -122,8 +122,7 @@ TEST_F(xmlconfig_test, check_option)
 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));