mesa: fix MSAA enable state in update_multisample()

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 344af91e172fcf50b0158072ce58349c46ecd4fa..d355f78a0efbf98b2ac1184c6f91d4edf0042589 100644 (file)
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -295,10 +295,10 @@ static void
 update_multisample(GLcontext *ctx)
 {
    ctx->Multisample._Enabled = GL_FALSE;
-   if (ctx->DrawBuffer) {
-      if (ctx->DrawBuffer->Visual.sampleBuffers)
-         ctx->Multisample._Enabled = GL_TRUE;
-   }
+   if (ctx->Multisample.Enabled &&
+       ctx->DrawBuffer &&
+       ctx->DrawBuffer->Visual.sampleBuffers)
+      ctx->Multisample._Enabled = GL_TRUE;
 }