KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Anholt 2020-09-25 15:06:11 -07:00 committed by Marge Bot
parent 8427e56067
commit b1e730b3b4
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/driconf.h
View File

@ -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

3
src/util/tests/xmlconfig.cpp
View File

@ -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));