summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2014-05-08 09:08:10 +0200
committerCarl Worth <cworth@cworth.org>2014-05-09 07:16:13 -0700
commite16de70a90a5a5a651e677b78f146382394c0d4b (patch)
tree1087c23694707c3c94d6e1fc6cf2cd9ce7fad1a5
parentf7b949723a1ebcc04a57f8ca5b52d340ffc04d84 (diff)
st/xa: Fix performance regression introduced by commit "Cache render target surface"
The mentioned commit has the nasty side-effect of turning off accelerated copies. Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> Reviewed-by: Rob Clark <robdclark@gmail.com> (cherry picked from commit 9306b7c171b29ac99f837e9efcd0281caf1d332e)
-rw-r--r--src/gallium/state_trackers/xa/xa_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/xa/xa_context.c b/src/gallium/state_trackers/xa/xa_context.c
index 71d3ddb1a89..7fba2a7ea1d 100644
--- a/src/gallium/state_trackers/xa/xa_context.c
+++ b/src/gallium/state_trackers/xa/xa_context.c
@@ -223,7 +223,7 @@ XA_EXPORT int
xa_copy_prepare(struct xa_context *ctx,
struct xa_surface *dst, struct xa_surface *src)
{
- if (src == dst || ctx->srf != NULL)
+ if (src == dst)
return -XA_ERR_INVAL;
if (src->tex->format != dst->tex->format) {