Mesa (master): Revert "r600g: use S_028B20_BUFFER_0_EN macro for streamout buffer enable"

Marek Olšák mareko at kemper.freedesktop.org
Fri Jan 27 16:50:58 UTC 2012


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri Jan 27 17:49:41 2012 +0100

Revert "r600g: use S_028B20_BUFFER_0_EN macro for streamout buffer enable"

This reverts commit d6cd514edbeca0de38561f66189748078d0dc602.

It broke multiple streamout buffers, because it only enabled the first one.

---

 src/gallium/drivers/r600/r600_hw_context.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index d1a7e38..ad568c6 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -2031,7 +2031,7 @@ static void r600_set_streamout_enable(struct r600_context *ctx, unsigned buffer_
 
 		ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_SET_CONTEXT_REG, 1, 0);
 		ctx->pm4[ctx->pm4_cdwords++] = (R_028B20_VGT_STRMOUT_BUFFER_EN - R600_CONTEXT_REG_OFFSET) >> 2;
-		ctx->pm4[ctx->pm4_cdwords++] = S_028B20_BUFFER_0_EN(buffer_enable_bit);
+		ctx->pm4[ctx->pm4_cdwords++] = buffer_enable_bit;
 	} else {
 		ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_SET_CONTEXT_REG, 1, 0);
 		ctx->pm4[ctx->pm4_cdwords++] = (R_028AB0_VGT_STRMOUT_EN - R600_CONTEXT_REG_OFFSET) >> 2;




More information about the mesa-commit mailing list