From 2fa3796bc1f42c24f0db6632d9a32e77d19f4b3e Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 18 May 2014 19:24:30 -0700 Subject: [PATCH] Revert "i965: Don't _swrast_BlitFramebuffer when doing CopyTexSubImage." This reverts commit bd44ac8b5ca08016bb064b37edaec95eccfdbcd5. Fixes: Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78842 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78843 Re-breaks: Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77705 but that will be fixed properly in a few commits. Reviewed-by: Ian Romanick Reviewed-by: Chris Forbes Cc: "10.2" --- src/mesa/drivers/common/meta_blit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index e5a0a9ad000..beb1ea5a8cd 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -732,7 +732,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, _mesa_meta_end(ctx); fallback: - if (mask && !ctx->Meta->Blit.no_ctsi_fallback) { + if (mask) { _swrast_BlitFramebuffer(ctx, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } -- 2.30.2