Merge remote-tracking branch 'origin/7.11' into 7.11

This commit is contained in:
Ian Romanick 2011-07-28 16:18:51 -07:00
commit fffd20cdc1
2 changed files with 2 additions and 2 deletions

View file

@ -1747,7 +1747,7 @@ void evergreen_pipe_shader_vs(struct pipe_context *ctx, struct r600_pipe_shader
r600_pipe_state_add_reg(rstate,
R_0286C4_SPI_VS_OUT_CONFIG,
S_0286C4_VS_EXPORT_COUNT(rshader->noutput - 2),
S_0286C4_VS_EXPORT_COUNT(rshader->noutput - 1),
0xFFFFFFFF, NULL);
r600_pipe_state_add_reg(rstate,
R_028860_SQ_PGM_RESOURCES_VS,

View file

@ -1505,7 +1505,7 @@ void r600_pipe_shader_vs(struct pipe_context *ctx, struct r600_pipe_shader *shad
r600_pipe_state_add_reg(rstate,
R_0286C4_SPI_VS_OUT_CONFIG,
S_0286C4_VS_EXPORT_COUNT(rshader->noutput - 2),
S_0286C4_VS_EXPORT_COUNT(rshader->noutput - 1),
0xFFFFFFFF, NULL);
r600_pipe_state_add_reg(rstate,
R_028868_SQ_PGM_RESOURCES_VS,