From: Pierre-Eric Pelloux-Prayer Date: Tue, 29 Oct 2019 18:45:48 +0000 (+0100) Subject: mesa: enable msaa in clear_with_quad if needed X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a723282e3f7a312ab0ca3aa9157e5b76ec182af;p=mesa.git mesa: enable msaa in clear_with_quad if needed If the DrawBuffer sample count is > 1 and msaa is enabled we must also enable msaa when clearing it. Fixes: ea5b7de138b ("radeonsi: make gl_SampleMaskIn = 0x1 when MSAA is disabled") Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1991 Reviewed-by: Marek Olšák Tested-by: Witold Baryluk --- diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c index 06fb9798c68..1e28e27586a 100644 --- a/src/mesa/state_tracker/st_cb_clear.c +++ b/src/mesa/state_tracker/st_cb_clear.c @@ -325,6 +325,7 @@ clear_with_quad(struct gl_context *ctx, unsigned clear_buffers) cso_set_stream_outputs(cso, 0, NULL, NULL); cso_set_sample_mask(cso, ~0); cso_set_min_samples(cso, 1); + st->clear.raster.multisample = st->state.fb_num_samples > 1; cso_set_rasterizer(cso, &st->clear.raster); /* viewport state: viewport matching window dims */