summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2014-05-18 19:24:30 -0700
committerIan Romanick <ian.d.romanick@intel.com>2014-05-23 09:46:57 -0700
commite306ba9a9b4c906295be4c24a83b24fce44098be (patch)
treef9f1c3cf9899904874ebfa02202e9af8928a0d98
parent81fb9ef11263b9381d9e4686ee2a35b7c85ea017 (diff)
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 <ian.d.romanick@intel.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 2fa3796bc1f42c24f0db6632d9a32e77d19f4b3e)
-rw-r--r--src/mesa/drivers/common/meta_blit.c2
1 files changed, 1 insertions, 1 deletions
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);
}