diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-09-18 13:14:36 +1000 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-09-18 13:14:36 +1000 |
commit | b1d8b6c4d986a6526f20e1e89982036f0ba85222 (patch) | |
tree | 5ca75a54aff8c5504731fe1e3dead9bbe3b92c44 /src/mesa/main/state.c | |
parent | 6fca18696d0e6a243f6fbb5a30de45100a8e5fa0 (diff) | |
parent | a06d38a74e865a0373a7314aad26b25c27ef8c57 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/main/state.c')
-rw-r--r-- | src/mesa/main/state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 344af91e17..d355f78a0e 100644 --- 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; } |