diff options
author | marha <marha@users.sourceforge.net> | 2013-08-01 13:22:08 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-08-01 13:22:08 +0200 |
commit | 0659c77949b38440a2a9ba67e1ee9cacef1f3a7f (patch) | |
tree | 891077ab7001a45e0e37ff2e554db0c56671acdc /mesalib/src/mesa/drivers/dri/common/xmlconfig.c | |
parent | 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (diff) | |
download | vcxsrv-0659c77949b38440a2a9ba67e1ee9cacef1f3a7f.tar.gz vcxsrv-0659c77949b38440a2a9ba67e1ee9cacef1f3a7f.tar.bz2 vcxsrv-0659c77949b38440a2a9ba67e1ee9cacef1f3a7f.zip |
libX11 mesa xserver xkeyboard-config git update 1 aug 2013
xserver commit b6e5c4669e0db391966deb397e8c975ec7f0124d
xkeyboard-config commit abaf14335dc6504e59d91e77babc8e034df5beb7
libX11 commit 44f84223f5e2dd46883fcbd352af2798bfa9aeb6
mesa commit 3eef7fec677f40eef1674e44e7ebd836bc7f8612
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", |