diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2013-07-30 22:29:22 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2013-07-30 23:31:24 +0200 |
| commit | 7f2f804c75f6c7451c3630cb48e4675686bd68a7 (patch) | |
| tree | 0e2db846abb5bfd6c604048db502814a7c1f3142 | |
| parent | bc4f0b6bacff34c724a2a301662051364870e5e5 (diff) | |
driconf: enable app-specific workarounds for all drivers
They were only enabled for i965.
Note that drirc must be installed in /etc.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | src/mesa/drivers/dri/common/drirc | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/xmlconfig.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/common/drirc b/src/mesa/drivers/dri/common/drirc index 556d1b599bd..7c2d3ba8f0a 100644 --- a/src/mesa/drivers/dri/common/drirc +++ b/src/mesa/drivers/dri/common/drirc @@ -1,8 +1,10 @@ <driconf> - <device screen="0" driver="i965"> + <!-- Please always enable app-specific workarounds for all drivers and + screens. --> + <device> <application name="Unigine Sanctuary" executable="Sanctuary"> <option name="force_glsl_extensions_warn" value="true" /> <option name="disable_blend_func_extended" value="true" /> </application> <application name="Unigine Tropics" executable="Tropics"> <option name="force_glsl_extensions_warn" value="true" /> diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c index 72483a42a5c..5c97c20fc0b 100644 --- a/src/mesa/drivers/dri/common/xmlconfig.c +++ b/src/mesa/drivers/dri/common/xmlconfig.c @@ -809,13 +809,15 @@ static void parseOptConfAttr (struct OptConfData *data, const XML_Char **attr) { if (!name) XML_WARNING1 ("name attribute missing in option."); if (!value) XML_WARNING1 ("value attribute missing in option."); if (name && value) { driOptionCache *cache = data->cache; GLuint opt = findOption (cache, name); if (cache->info[opt].name == NULL) - XML_WARNING ("undefined option: %s.", name); + /* 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)) /* 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)) XML_WARNING ("illegal option value: %s.", value); |