[Mesa-dev] [PATCH 3/6] radeon: add support for streams to the common streamout code.

[Dave Airlie]

From: Glenn Kennard <glenn.kennard at gmail.com>

This just adds to the common radeon streamout code, support
for multiple streams.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/gallium/drivers/radeon/r600_pipe_common.h |  1 +
 src/gallium/drivers/radeon/r600_streamout.c   | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index a471426..22d940e 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -327,6 +327,7 @@ struct r600_streamout {
 	/* External state which comes from the vertex shader,
 	 * it must be set explicitly when binding a shader. */
 	unsigned			*stride_in_dw;
+	unsigned			enabled_stream_buffers_mask; /* stream0 buffers0-3 in 4 LSB */
 
 	/* The state of VGT_STRMOUT_(CONFIG|EN). */
 	struct r600_atom		enable_atom;
diff --git a/src/gallium/drivers/radeon/r600_streamout.c b/src/gallium/drivers/radeon/r600_streamout.c
index bc8bf97..a602dac 100644
--- a/src/gallium/drivers/radeon/r600_streamout.c
+++ b/src/gallium/drivers/radeon/r600_streamout.c
@@ -195,7 +195,11 @@ static void r600_emit_streamout_begin(struct r600_common_context *rctx, struct r
 	r600_write_context_reg(cs, rctx->chip_class >= EVERGREEN ?
 				       R_028B98_VGT_STRMOUT_BUFFER_CONFIG :
 				       R_028B20_VGT_STRMOUT_BUFFER_EN,
-			       rctx->streamout.enabled_mask);
+			       (rctx->streamout.enabled_mask |
+					(rctx->streamout.enabled_mask << 4) |
+					(rctx->streamout.enabled_mask << 8) |
+					(rctx->streamout.enabled_mask << 12)) &
+					 rctx->streamout.enabled_stream_buffers_mask);
 
 	for (i = 0; i < rctx->streamout.num_targets; i++) {
 		if (!t[i])
@@ -326,11 +330,18 @@ static bool r600_get_strmout_en(struct r600_common_context *rctx)
 static void r600_emit_streamout_enable(struct r600_common_context *rctx,
 				       struct r600_atom *atom)
 {
-	r600_write_context_reg(rctx->rings.gfx.cs,
-			       rctx->chip_class >= EVERGREEN ?
-				       R_028B94_VGT_STRMOUT_CONFIG :
-				       R_028AB0_VGT_STRMOUT_EN,
-			       S_028B94_STREAMOUT_0_EN(r600_get_strmout_en(rctx)));
+	unsigned reg = R_028AB0_VGT_STRMOUT_EN;
+	unsigned val = S_028B94_STREAMOUT_0_EN(r600_get_strmout_en(rctx));
+	if (rctx->chip_class >= EVERGREEN) {
+		reg = R_028B94_VGT_STRMOUT_CONFIG;
+		val |=
+			S_028B94_RAST_STREAM(0) |
+			S_028B94_STREAMOUT_1_EN(r600_get_strmout_en(rctx)) |
+			S_028B94_STREAMOUT_2_EN(r600_get_strmout_en(rctx)) |
+			S_028B94_STREAMOUT_3_EN(r600_get_strmout_en(rctx));
+	}
+
+	r600_write_context_reg(rctx->rings.gfx.cs, reg, val);
 }
 
 static void r600_set_streamout_enable(struct r600_common_context *rctx, bool enable)
-- 
2.4.3