diff options
| author | Alexander Monakov <amonakov@ispras.ru> | 2013-04-02 01:38:27 +0400 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-04-05 14:32:45 -0700 |
| commit | 9cda3560048e8595d3ffa315b76487f4479bff2c (patch) | |
| tree | a4ecdac531b4d40bbf10399a0123a077a74d48db /src/glx | |
| parent | aac7f06ad843eaa696363e8e9c7781ca30cb4914 (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
Diffstat (limited to 'src/glx')
| -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 7b62be3441..5c79073a9c 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); /** |