From adba706122ee033a4f8023bd309b73b0a5c52105 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Tue, 15 Nov 2016 14:37:05 +0100 Subject: [PATCH] mesa/main: consider multisampling enabled when number of samples == 1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit There are some differences between how non-multisampled framebuffers (i.e. samples == 0) and multisampled framebuffers with a single sample should be treated. For example, alpha to coverage and writing to gl_SampleMask has an effect with single-sample multisample framebuffers, but not on non-multisample framebuffers. This fixes GL45-CTS.sample_variables.mask.*.samples_1.* at least for Gallium drivers (and possibly others, though at least radeonsi needs an additional fix). Reviewed-by: Marek Olšák Reviewed-by: Edward O'Callaghan --- src/mesa/main/framebuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c index 9c7f0c9451f..20d03fe281c 100644 --- a/src/mesa/main/framebuffer.c +++ b/src/mesa/main/framebuffer.c @@ -1003,7 +1003,7 @@ _mesa_is_multisample_enabled(const struct gl_context *ctx) */ return ctx->Multisample.Enabled && ctx->DrawBuffer && - _mesa_geometric_nonvalidated_samples(ctx->DrawBuffer) > 1; + _mesa_geometric_nonvalidated_samples(ctx->DrawBuffer) >= 1; } /** -- 2.30.2