Mesa (10.2): st/xa: Fix performance regression introduced by commit " Cache render target surface"

[Ian Romanick]

Module: Mesa
Branch: 10.2
Commit: 2b34277bbdde46b2c6396e8cc11ef885358feaf1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b34277bbdde46b2c6396e8cc11ef885358feaf1

Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Thu May  8 09:08:10 2014 +0200

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 at lists.freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob at vmware.com>
Reviewed-by: Rob Clark <robdclark at gmail.com>
(cherry picked from commit 9306b7c171b29ac99f837e9efcd0281caf1d332e)

---

 src/gallium/state_trackers/xa/xa_context.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/xa/xa_context.c b/src/gallium/state_trackers/xa/xa_context.c
index 37de45b..df3043c 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) {