Mesa (10.1): r600g: fix edge flags and layered rendering on R600-R700

[Carl Worth]

Module: Mesa
Branch: 10.1
Commit: 081e37b3b6da2443a1a1a33e19a11816ad3121e8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=081e37b3b6da2443a1a1a33e19a11816ad3121e8

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Apr 19 17:21:57 2014 +0200

r600g: fix edge flags and layered rendering on R600-R700

We forgot to set these bits.

Cc: 10.1 mesa-stable at lists.freedesktop.org
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
(cherry picked from commit e5741f1e91429366699cb0a57c40968f0f9fd8cb)

Conflicts:
	src/gallium/drivers/r600/r600_state.c

---

 src/gallium/drivers/r600/r600_state.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 1b73ce3..a3af3c8 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -2996,7 +2996,9 @@ void r600_update_vs_state(struct pipe_context *ctx, struct r600_pipe_shader *sha
 		S_02881C_VS_OUT_CCDIST0_VEC_ENA((rshader->clip_dist_write & 0x0F) != 0) |
 		S_02881C_VS_OUT_CCDIST1_VEC_ENA((rshader->clip_dist_write & 0xF0) != 0) |
 		S_02881C_VS_OUT_MISC_VEC_ENA(rshader->vs_out_misc_write) |
-		S_02881C_USE_VTX_POINT_SIZE(rshader->vs_out_point_size);
+		S_02881C_USE_VTX_POINT_SIZE(rshader->vs_out_point_size) |
+		S_02881C_USE_VTX_EDGE_FLAG(rshader->vs_out_edgeflag) |
+		S_02881C_USE_VTX_RENDER_TARGET_INDX(rshader->vs_out_layer);
 }
 
 static unsigned r600_conv_prim_to_gs_out(unsigned mode)