svga: Prefer accelerated blits over cpu copy region

This reduces the number of cpu copy_region fallbacks on a Nvidia system
running the piglit command

./publish/bin/piglit run  -1 -t copy -t blit tests/quick

from 64789 to 780

Previously this has caused a regression in piglit test
spec@!opengl 1.0@gl-1.0-scissor-copypixels, but I'm currently not able to
reproduce that regression.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>

diff --git a/src/gallium/drivers/svga/svga_pipe_blit.c b/src/gallium/drivers/svga/svga_pipe_blit.c
index 3d7196dddd2a633ab615b4c3b9a6b637acd2a125..ef5aeee9a16ba5893345763c5812399b011ce16a 100644 (file)
--- a/src/gallium/drivers/svga/svga_pipe_blit.c
+++ b/src/gallium/drivers/svga/svga_pipe_blit.c
@@ -669,14 +669,12 @@ svga_blit(struct pipe_context *pipe,
    if (try_copy_region(svga, blit))
       goto done;
 
-   /* FIXME: Ideally, we should call try_blit() before try_cpu_copy_region(),
-    * however that breaks piglit test gl-1.0-scissor-copypixels.
-    */
-   if (try_cpu_copy_region(svga, blit))
+   if (try_blit(svga, blit))
       goto done;
 
-   if (try_blit(svga, blit))
+   if (!try_cpu_copy_region(svga, blit))
       debug_printf("svga: Blit failed.\n");
+   
 done:
    SVGA_STATS_TIME_POP(sws);  /* SVGA_STATS_TIME_BLIT */
    (void) sws;