[Mesa-dev] [PATCH 4/3] mesa: use default geometry's samples when there are no attachments

[Ilia Mirkin]

Perhaps worth mentioning that with this series, the improved tests I
posted to the piglit ml pass on HSW. Without them, some of the new
test-cases fail. [So these aren't just papering over failures in
st/mesa impl that I was playing with for nvc0.]

On Sun, Jan 31, 2016 at 1:11 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> Whether multisampling is turned on depends, in part, on whether
> attachments are themselves multisample surfaces. However when there are
> no attachments, we should rely on the default geometry for this.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>
> With this, nvc0 works as expected (in a soon-to-be sent test update)
>
>  src/mesa/main/state.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
> index 4043c4f..57f1341 100644
> --- a/src/mesa/main/state.c
> +++ b/src/mesa/main/state.c
> @@ -352,7 +352,7 @@ update_multisample(struct gl_context *ctx)
>     ctx->Multisample._Enabled = GL_FALSE;
>     if (ctx->Multisample.Enabled &&
>         ctx->DrawBuffer &&
> -       ctx->DrawBuffer->Visual.sampleBuffers)
> +       _mesa_geometric_samples(ctx->DrawBuffer) > 0)
>        ctx->Multisample._Enabled = GL_TRUE;
>  }
>
> --
> 2.4.10
>