From bf8fba221ea5c4da904344070fb8fe28edb742a7 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Tue, 2 Apr 2013 01:38:27 +0400 Subject: Honor GLX_DONT_CARE in MATCH_MASK NOTE: This is a candidate for stable branches. Reviewed-by: Ian Romanick 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 (cherry picked from commit 9cda3560048e8595d3ffa315b76487f4479bff2c) --- src/glx/glxcmds.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 37c0933674..539774af5c 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -951,8 +951,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); /** -- cgit v1.2.3