Mesa (master): r600g/compute: Don't flush the cs in pipe_context:: launch_grid()

[Tom Stellard]

Module: Mesa
Branch: master
Commit: f0435ebb07d01a77ca0d98967a002898811a5206
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0435ebb07d01a77ca0d98967a002898811a5206

Author: Tom Stellard <thomas.stell...@amd.com>
Date:   Mon Aug 26 17:55:49 2013 -0700

r600g/compute: Don't flush the cs in pipe_context::launch_grid()

This is the state tracker's responsibility.

Reviewed-by: Marek Olšák <marek.ol...@amd.com>

---

 src/gallium/drivers/r600/evergreen_compute.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_compute.c 
b/src/gallium/drivers/r600/evergreen_compute.c
index fbbc4fd..076c09c 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -473,6 +473,7 @@ static void compute_emit_cs(struct r600_context *ctx, const 
uint *block_layout,
                      R600_CONTEXT_INV_VERTEX_CACHE |
                      R600_CONTEXT_INV_TEX_CACHE;
        r600_flush_emit(ctx);
+       ctx->b.flags = 0;
 
 #if 0
        COMPUTE_DBG(ctx->screen, "cdw: %i\n", cs->cdw);
@@ -481,16 +482,6 @@ static void compute_emit_cs(struct r600_context *ctx, 
const uint *block_layout,
        }
 #endif
 
-       flush_flags = RADEON_FLUSH_ASYNC | RADEON_FLUSH_COMPUTE;
-       if (ctx->keep_tiling_flags) {
-               flush_flags |= RADEON_FLUSH_KEEP_TILING_FLAGS;
-       }
-
-       ctx->b.ws->cs_flush(ctx->b.rings.gfx.cs, flush_flags, 
ctx->screen->cs_count++);
-
-       ctx->b.flags = 0;
-
-       COMPUTE_DBG(ctx->screen, "shader started\n");
 }
 
 

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit