From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 15 Sep 2008 23:10:04 +0000 (-0600)
Subject: mesa: fix MSAA enable state in update_multisample()
X-Git-Tag: android-x86-1.6~660
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9d48a7832b78658d2422ae5a185276c41750010d;p=android-x86%2Fexternal-mesa.git

mesa: fix MSAA enable state in update_multisample()
---

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 7192bed4a3d..d60b9a13d8b 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1067,10 +1067,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;
 }