summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2016-11-15 14:37:05 +0100
committerNicolai Hähnle <[email protected]>2016-11-18 09:48:14 +0100
commitadba706122ee033a4f8023bd309b73b0a5c52105 (patch)
treef185cf4bdddd0906708bc16bea59d7b616542366 /src/mesa/main
parent14af96007f42acd7f8dd8569b1a5cee1d47c08a8 (diff)
mesa/main: consider multisampling enabled when number of samples == 1
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 <[email protected]> Reviewed-by: Edward O'Callaghan <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/framebuffer.c2
1 files changed, 1 insertions, 1 deletions
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;
}
/**