Mesa (master): Honor GLX_DONT_CARE in MATCH_MASK

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 9cda3560048e8595d3ffa315b76487f4479bff2c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9cda3560048e8595d3ffa315b76487f4479bff2c

Author: Alexander Monakov <amonakov at ispras.ru>
Date:   Tue Apr  2 01:38:27 2013 +0400

Honor GLX_DONT_CARE in MATCH_MASK

NOTE: This is a candidate for stable branches.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47478
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62999
Bugzilla: http://bugs.winehq.org/show_bug.cgi?id=26763

---

 src/glx/glxcmds.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 7b62be3..5c79073 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -912,8 +912,10 @@ init_fbconfig_for_chooser(struct glx_config * config,
 /* Test that all bits from a are contained in b */
 #define MATCH_MASK(param)			\
   do {						\
-    if ((a->param & ~b->param) != 0)		\
+    if ( ((int) a-> param != (int) GLX_DONT_CARE)	\
+         && ((a->param & ~b->param) != 0) ) {   \
       return False;				\
+    }                                           \
   } while (0);
 
 /**