From c6d74bfaf61a6d52e6f886e33f2e98c3007d79fc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 2 Dec 2012 16:18:22 -0700 Subject: [PATCH] st/glx: accept GLX_SAMPLE_BUFFERS/SAMPLES_ARB == 0 Only fail if GLX_SAMPLE_BUFFERS_ARB or GLX_SAMPLES_ARB are non-zero. We were already doing this in the older swrast/glx code. This fixes a piglit/waffle problem where we'd always fail to get a visual/config and report the test as "skip". Note: This is a candidate for the stable branches. Reviewed-by: Kenneth Graunke --- src/gallium/state_trackers/glx/xlib/glx_api.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c index 08db6e821ec..8e3c6b89f24 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_api.c +++ b/src/gallium/state_trackers/glx/xlib/glx_api.c @@ -832,11 +832,13 @@ choose_visual( Display *dpy, int screen, const int *list, GLboolean fbConfig ) * GLX_ARB_multisample */ case GLX_SAMPLE_BUFFERS_ARB: - /* ms not supported */ - return NULL; case GLX_SAMPLES_ARB: - /* ms not supported */ - return NULL; + parselist++; + if (*parselist++ != 0) { + /* ms not supported */ + return NULL; + } + break; /* * FBConfig attribs. -- 2.11.0