diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-01 13:25:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-01 13:25:23 +0200 |
| commit | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (patch) | |
| tree | f86937d9126b2d543ffd13f861a1271f48bd69e6 /mesalib/src/mesa/drivers/dri/common/xmlconfig.c | |
| parent | acad661e29a4f09d06f829fdfea949814da57da6 (diff) | |
| parent | 0659c77949b38440a2a9ba67e1ee9cacef1f3a7f (diff) | |
| download | vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.tar.gz vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.tar.bz2 vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xserver xkeyboard-config git update 1 aug 2013
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common/xmlconfig.c')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/xmlconfig.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c index 72483a42a..5c97c20fc 100644 --- a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c +++ b/mesalib/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", |