Merge commit 'origin/master' into gallium-0.2

Conflicts:

	progs/trivial/Makefile
	src/mesa/glapi/glthread.c
This commit is contained in:
Keith Whitwell
2008-09-18 18:57:46 +01:00
37 changed files with 399 additions and 205 deletions

View File

@@ -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;
}