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

util/driconfig: print ATTENTION if MESA_DEBUG=silent is not set

Browse Source 
unix-bytebenchmark refuses to run if the driver prints ATTENTION to stderr.

Acked-by: Eric Engestrom <eric@engestrom.ch>
This commit is contained in:
Marek Olšák
2019-11-25 20:05:47 -05:00
parent d61a21f439
commit 5e81fbf44a
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/xmlconfig.c
+22 -7
View File
@@ -52,6 +52,16 @@
#define PATH_MAX 4096
#endif
static bool
be_verbose(void)
{
const char *s = getenv("MESA_DEBUG");
if (!s)
return true;
return strstr(s, "silent") == NULL;
}
/** \brief Find an option in an option cache with the name as key */
static uint32_t
findOption(const driOptionCache *cache, const char *name)
@@ -548,9 +558,11 @@ parseOptInfoAttr(struct OptInfoData *data, const XML_Char **attr)
defaultVal = getenv (cache->info[opt].name);
if (defaultVal != NULL) {
/* don't use XML_WARNING, we want the user to see this! */
fprintf (stderr,
"ATTENTION: default value of option %s overridden by environment.\n",
cache->info[opt].name);
if (be_verbose()) {
fprintf(stderr,
"ATTENTION: default value of option %s overridden by environment.\n",
cache->info[opt].name);
}
} else
defaultVal = attrVal[OA_DEFAULT];
if (!parseValue (&cache->values[opt], cache->info[opt].type, defaultVal))
@@ -831,11 +843,14 @@ parseOptConfAttr(struct OptConfData *data, const XML_Char **attr)
/* don't use XML_WARNING, drirc defines options for all drivers,
* but not all drivers support them */
return;
else if (getenv (cache->info[opt].name))
else if (getenv (cache->info[opt].name)) {
/* don't use XML_WARNING, we want the user to see this! */
fprintf (stderr, "ATTENTION: option value of option %s ignored.\n",
cache->info[opt].name);
else if (!parseValue (&cache->values[opt], cache->info[opt].type, value))
if (be_verbose()) {
fprintf(stderr,
"ATTENTION: option value of option %s ignored.\n",
cache->info[opt].name);
}
} else if (!parseValue (&cache->values[opt], cache->info[opt].type, value))
XML_WARNING ("illegal option value: %s.", value);
}
}