summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2014-04-19 17:21:57 +0200
committerCarl Worth <cworth@cworth.org>2014-04-30 15:28:10 -0700
commit081e37b3b6da2443a1a1a33e19a11816ad3121e8 (patch)
tree849e94de74d57fd8815a302d67568cb65110b9bf /src
parent4f3abcfee40531927e5b6ede1e67d995ab8ab182 (diff)
downloadmesa-081e37b3b6da2443a1a1a33e19a11816ad3121e8.tar.gz
r600g: fix edge flags and layered rendering on R600-R700
We forgot to set these bits. Cc: 10.1 mesa-stable@lists.freedesktop.org Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit e5741f1e91429366699cb0a57c40968f0f9fd8cb) Conflicts: src/gallium/drivers/r600/r600_state.c
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/r600/r600_state.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 1b73ce3021..a3af3c881c 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)