aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/common
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-24 08:59:35 +0100
committermarha <marha@users.sourceforge.net>2012-01-24 08:59:35 +0100
commite3a6ca7bffc785a13361efdbf81ef4776c050df0 (patch)
tree2277a7dccab07794bd37b255ae6b5e2716e0c855 /mesalib/src/mesa/drivers/common
parent780fcf7fcf5701c79568c95f32823cfa8e564665 (diff)
parentb683b8f5675e280a6dd4ab82d6b9394182798b55 (diff)
downloadvcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.gz
vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.bz2
vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/dix/grabs.c
Diffstat (limited to 'mesalib/src/mesa/drivers/common')
-rw-r--r--mesalib/src/mesa/drivers/common/meta.c7
1 files changed, 6 insertions, 1 deletions
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);