From d2d3cd2be78022e585b4a155d742d346471453d0 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 26 Jan 2013 10:09:37 -0700 Subject: st/mesa: set ctx->Const.MaxSamples = 0, not 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The gallium docs for pipe_screen::is_format_supported() says that samples==0 or samples==1 both mean that multisampling is not supported. Return GL_MAX_SAMPLES==0 instead of 1 for consistency with other drivers. Note: This is a candidate for the 9.0 branch. Reviewed-by: Marek Olšák (cherry picked from commit d60da27273d2cdb68bc32cae2ca66718dab15f27) --- src/mesa/state_tracker/st_extensions.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index ac11f127c0..7cac78280b 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -630,6 +630,10 @@ void st_init_extensions(struct st_context *st) break; } } + if (ctx->Const.MaxSamples == 1) { + /* one sample doesn't really make sense */ + ctx->Const.MaxSamples = 0; + } if (ctx->Const.MaxDualSourceDrawBuffers > 0) ctx->Extensions.ARB_blend_func_extended = GL_TRUE; -- cgit v1.2.3