Revert "i965: Don't _swrast_BlitFramebuffer when doing CopyTexSubImage."
authorKenneth Graunke <kenneth@whitecape.org>
Mon, 19 May 2014 02:24:30 +0000 (19:24 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Tue, 20 May 2014 00:18:54 +0000 (17:18 -0700)
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 <ian.d.romanick@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
src/mesa/drivers/common/meta_blit.c

index e5a0a9ad000dbc162f58649be5ca2a62f2f3f30b..beb1ea5a8cdc2c734638511a6c531320656ac106 100644 (file)
@@ -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);
    }