Mesa (master): radeonsi: remove ps_partial_flush

Christian König deathsimple at kemper.freedesktop.org
Sat Aug 11 08:36:11 UTC 2012


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

Author: Christian König <deathsimple at vodafone.de>
Date:   Thu Aug  2 15:06:59 2012 +0200

radeonsi: remove ps_partial_flush

Not needed any more.

Signed-off-by: Christian König <deathsimple at vodafone.de>

---

 .../drivers/radeonsi/evergreen_hw_context.c        |   13 -------------
 src/gallium/drivers/radeonsi/r600.h                |    1 -
 src/gallium/drivers/radeonsi/r600_hw_context.c     |   13 -------------
 src/gallium/drivers/radeonsi/si_state_draw.c       |    2 +-
 4 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/evergreen_hw_context.c b/src/gallium/drivers/radeonsi/evergreen_hw_context.c
index 0d0d64b..d071617 100644
--- a/src/gallium/drivers/radeonsi/evergreen_hw_context.c
+++ b/src/gallium/drivers/radeonsi/evergreen_hw_context.c
@@ -42,19 +42,6 @@ int si_context_init(struct r600_context *ctx)
 	return 0;
 }
 
-static inline void evergreen_context_ps_partial_flush(struct r600_context *ctx)
-{
-	struct radeon_winsys_cs *cs = ctx->cs;
-
-	if (!(ctx->flags & R600_CONTEXT_DRAW_PENDING))
-		return;
-
-	cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
-	cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
-
-	ctx->flags &= ~R600_CONTEXT_DRAW_PENDING;
-}
-
 void si_context_draw(struct r600_context *ctx, const struct r600_draw *draw)
 {
 	struct radeon_winsys_cs *cs = ctx->cs;
diff --git a/src/gallium/drivers/radeonsi/r600.h b/src/gallium/drivers/radeonsi/r600.h
index f22d920..610b9da 100644
--- a/src/gallium/drivers/radeonsi/r600.h
+++ b/src/gallium/drivers/radeonsi/r600.h
@@ -92,7 +92,6 @@ struct r600_so_target {
 	unsigned		so_index;
 };
 
-#define R600_CONTEXT_DRAW_PENDING	(1 << 0)
 #define R600_CONTEXT_DST_CACHES_DIRTY	(1 << 1)
 #define R600_CONTEXT_CHECK_EVENT_FLUSH	(1 << 2)
 
diff --git a/src/gallium/drivers/radeonsi/r600_hw_context.c b/src/gallium/drivers/radeonsi/r600_hw_context.c
index d6b3b74..509a8bf 100644
--- a/src/gallium/drivers/radeonsi/r600_hw_context.c
+++ b/src/gallium/drivers/radeonsi/r600_hw_context.c
@@ -115,19 +115,6 @@ err:
 	return;
 }
 
-static inline void r600_context_ps_partial_flush(struct r600_context *ctx)
-{
-	struct radeon_winsys_cs *cs = ctx->cs;
-
-	if (!(ctx->flags & R600_CONTEXT_DRAW_PENDING))
-		return;
-
-	cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
-	cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_PS_PARTIAL_FLUSH) | EVENT_INDEX(4);
-
-	ctx->flags &= ~R600_CONTEXT_DRAW_PENDING;
-}
-
 /* initialize */
 void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw,
 			boolean count_draw_in)
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 10cf54b..e974642 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -543,7 +543,7 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo)
 
 	si_context_draw(rctx, &rdraw);
 
-	rctx->flags |= R600_CONTEXT_DST_CACHES_DIRTY | R600_CONTEXT_DRAW_PENDING;
+	rctx->flags |= R600_CONTEXT_DST_CACHES_DIRTY;
 
 	if (rctx->framebuffer.zsbuf)
 	{




More information about the mesa-commit mailing list