On Thu, Apr 4, 2013 at 1:02 AM, Ian Romanick <i...@freedesktop.org> wrote: > Reveiwed-by: Ian Romanick <ian.d.roman...@intel.com> > > Please add the following lines to the commit message: > > NOTE: This is a candidate for stable branches. > > 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
Done. I don't have git write access, can you push it for me?
From e19c1fcfdd72fc3f87908db77808f65be5000843 Mon Sep 17 00:00:00 2001 From: Alexander Monakov <amona...@ispras.ru> Date: Tue, 2 Apr 2013 01:38:27 +0400 Subject: [PATCH] Honor GLX_DONT_CARE in MATCH_MASK NOTE: This is a candidate for stable branches. 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 file changed, 3 insertions(+), 1 deletion(-) 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); /** -- 1.7.11.5
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev