Module: Mesa Branch: master Commit: 7f2f804c75f6c7451c3630cb48e4675686bd68a7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f2f804c75f6c7451c3630cb48e4675686bd68a7
Author: Marek Olšák <[email protected]> Date: Tue Jul 30 22:29:22 2013 +0200 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 <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Ian Romanick <[email protected]> --- src/mesa/drivers/dri/common/drirc | 4 +++- 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 556d1b5..7c2d3ba 100644 --- a/src/mesa/drivers/dri/common/drirc +++ b/src/mesa/drivers/dri/common/drirc @@ -1,5 +1,7 @@ <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" /> diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c index 72483a4..5c97c20 100644 --- a/src/mesa/drivers/dri/common/xmlconfig.c +++ b/src/mesa/drivers/dri/common/xmlconfig.c @@ -812,7 +812,9 @@ static void parseOptConfAttr (struct OptConfData *data, const XML_Char **attr) { 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", _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
