From b683b8f5675e280a6dd4ab82d6b9394182798b55 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 24 Jan 2012 08:53:36 +0100 Subject: libX11 mesa xserver git update 24 jan 2012 --- mesalib/src/mesa/drivers/common/meta.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mesalib/src/mesa/drivers/common') diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index dca3613a6..05cc712cf 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -1451,7 +1451,12 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, struct vertex verts[4]; GLboolean newTex; - if (srcW > maxTexSize || srcH > maxTexSize) { + /* In addition to falling back if the blit size is larger than the maximum + * texture size, fallback if the source is multisampled. This fallback can + * be removed once Mesa gets support ARB_texture_multisample. + */ + if (srcW > maxTexSize || srcH > maxTexSize + || ctx->ReadBuffer->Visual.samples > 0) { /* XXX avoid this fallback */ _swrast_BlitFramebuffer(ctx, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); -- cgit v1.2.3