Merge commit 'origin/master' into gallium-0.2
Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
This commit is contained in:
@@ -317,10 +317,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;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user