diff options
| author | Alexander Monakov <amonakov@ispras.ru> | 2013-04-02 01:38:27 +0400 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-04-17 13:00:09 +0200 |
| commit | bf8fba221ea5c4da904344070fb8fe28edb742a7 (patch) | |
| tree | 4f5c1455f82b94744f12e97ee13abd49e67b47a5 | |
| parent | fef79264c597643ee7d44d4c28acb844176917f9 (diff) | |
Honor GLX_DONT_CARE in MATCH_MASK
NOTE: This is a candidate for stable branches.
Reviewed-by: Ian Romanick <ian.d.romanick@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
(cherry picked from commit 9cda3560048e8595d3ffa315b76487f4479bff2c)
| -rw-r--r-- | 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 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); /** |