radeonsi: emit DRAW_PREAMBLE only if it changes

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Marek Olšák 2014-12-07 20:23:56 +01:00
parent c466093512
commit 834bee42ed
3 changed files with 17 additions and 8 deletions

View file

@ -159,4 +159,6 @@ void si_begin_new_cs(struct si_context *ctx)
ctx->last_primitive_restart_en = -1; ctx->last_primitive_restart_en = -1;
ctx->last_restart_index = SI_RESTART_INDEX_UNKNOWN; ctx->last_restart_index = SI_RESTART_INDEX_UNKNOWN;
ctx->last_gs_out_prim = -1; ctx->last_gs_out_prim = -1;
ctx->last_prim = -1;
ctx->last_multi_vgt_param = -1;
} }

View file

@ -183,6 +183,8 @@ struct si_context {
int last_primitive_restart_en; int last_primitive_restart_en;
int last_restart_index; int last_restart_index;
int last_gs_out_prim; int last_gs_out_prim;
int last_prim;
int last_multi_vgt_param;
}; };
/* si_blit.c */ /* si_blit.c */

View file

@ -179,14 +179,19 @@ static void si_emit_draw_registers(struct si_context *sctx,
unsigned ia_multi_vgt_param = si_get_ia_multi_vgt_param(sctx, info); unsigned ia_multi_vgt_param = si_get_ia_multi_vgt_param(sctx, info);
/* Draw state. */ /* Draw state. */
if (sctx->b.chip_class >= CIK) { if (prim != sctx->last_prim ||
radeon_emit(cs, PKT3(PKT3_DRAW_PREAMBLE, 2, 0)); ia_multi_vgt_param != sctx->last_multi_vgt_param) {
radeon_emit(cs, prim); /* VGT_PRIMITIVE_TYPE */ if (sctx->b.chip_class >= CIK) {
radeon_emit(cs, ia_multi_vgt_param); /* IA_MULTI_VGT_PARAM */ radeon_emit(cs, PKT3(PKT3_DRAW_PREAMBLE, 2, 0));
radeon_emit(cs, 0); /* VGT_LS_HS_CONFIG */ radeon_emit(cs, prim); /* VGT_PRIMITIVE_TYPE */
} else { radeon_emit(cs, ia_multi_vgt_param); /* IA_MULTI_VGT_PARAM */
r600_write_config_reg(cs, R_008958_VGT_PRIMITIVE_TYPE, prim); radeon_emit(cs, 0); /* VGT_LS_HS_CONFIG */
r600_write_context_reg(cs, R_028AA8_IA_MULTI_VGT_PARAM, ia_multi_vgt_param); } else {
r600_write_config_reg(cs, R_008958_VGT_PRIMITIVE_TYPE, prim);
r600_write_context_reg(cs, R_028AA8_IA_MULTI_VGT_PARAM, ia_multi_vgt_param);
}
sctx->last_prim = prim;
sctx->last_multi_vgt_param = ia_multi_vgt_param;
} }
if (gs_out_prim != sctx->last_gs_out_prim) { if (gs_out_prim != sctx->last_gs_out_prim) {