radeonsi: emit DRAW_PREAMBLE only if it changes

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c
index a40387cadb9437499ace2e3705959baca2e064a3..b55cbf349486c3b1331bfcbfd995fe4f816388ae 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_hw_context.c
+++ b/src/gallium/drivers/radeonsi/si_hw_context.c
@@ -159,4 +159,6 @@ void si_begin_new_cs(struct si_context *ctx)
        ctx->last_primitive_restart_en = -1;
        ctx->last_restart_index = SI_RESTART_INDEX_UNKNOWN;
        ctx->last_gs_out_prim = -1;
+       ctx->last_prim = -1;
+       ctx->last_multi_vgt_param = -1;
 }

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 6766635b0a1fa63034ba0b5beb2f6067bef5261d..8e89e4a2ef0c0d84014be22124e9019c8a5bcaed 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -183,6 +183,8 @@ struct si_context {
        int                     last_primitive_restart_en;
        int                     last_restart_index;
        int                     last_gs_out_prim;
+       int                     last_prim;
+       int                     last_multi_vgt_param;
 };
 
 /* si_blit.c */

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 4ae825386e25523f2d29f15fd52afc43870205dd..195d98118f41bbd3eaab5d101cb80bd924bc5081 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -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);
 
        /* Draw state. */
-       if (sctx->b.chip_class >= CIK) {
-               radeon_emit(cs, PKT3(PKT3_DRAW_PREAMBLE, 2, 0));
-               radeon_emit(cs, prim); /* VGT_PRIMITIVE_TYPE */
-               radeon_emit(cs, ia_multi_vgt_param); /* IA_MULTI_VGT_PARAM */
-               radeon_emit(cs, 0); /* VGT_LS_HS_CONFIG */
-       } 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);
+       if (prim != sctx->last_prim ||
+           ia_multi_vgt_param != sctx->last_multi_vgt_param) {
+               if (sctx->b.chip_class >= CIK) {
+                       radeon_emit(cs, PKT3(PKT3_DRAW_PREAMBLE, 2, 0));
+                       radeon_emit(cs, prim); /* VGT_PRIMITIVE_TYPE */
+                       radeon_emit(cs, ia_multi_vgt_param); /* IA_MULTI_VGT_PARAM */
+                       radeon_emit(cs, 0); /* VGT_LS_HS_CONFIG */
+               } 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) {