radeonsi/gfx10: remove an obsolete VGT_REUSE_OFF workaround
authorMarek Olšák <marek.olsak@amd.com>
Wed, 31 Jul 2019 01:42:26 +0000 (21:42 -0400)
committerMarek Olšák <marek.olsak@amd.com>
Tue, 6 Aug 2019 21:09:01 +0000 (17:09 -0400)
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
src/gallium/drivers/radeonsi/si_shader.h
src/gallium/drivers/radeonsi/si_state_shaders.c

index f94bd71cee4b3ccfb3fd57b955917ca01b1db7a4..3ce3d4e824a280f083ba005b10f150ecc859b9dc 100644 (file)
@@ -696,7 +696,6 @@ struct si_shader {
                        unsigned        vgt_gs_onchip_cntl;
                        unsigned        vgt_gs_instance_cnt;
                        unsigned        vgt_esgs_ring_itemsize;
-                       unsigned        vgt_reuse_off;
                        unsigned        spi_vs_out_config;
                        unsigned        spi_shader_idx_format;
                        unsigned        spi_shader_pos_format;
index e3bb2760e08bf0763faf91ff5f5d7ef2794e38c7..d3c3677d82b15f665bb177d2cc6c8d9cfd01833b 100644 (file)
@@ -973,9 +973,6 @@ static void gfx10_emit_shader_ngg_tail(struct si_context *sctx,
        radeon_opt_set_context_reg(sctx, R_028AAC_VGT_ESGS_RING_ITEMSIZE,
                                   SI_TRACKED_VGT_ESGS_RING_ITEMSIZE,
                                   shader->ctx_reg.ngg.vgt_esgs_ring_itemsize);
-       radeon_opt_set_context_reg(sctx, R_028AB4_VGT_REUSE_OFF,
-                                  SI_TRACKED_VGT_REUSE_OFF,
-                                  shader->ctx_reg.ngg.vgt_reuse_off);
        radeon_opt_set_context_reg(sctx, R_0286C4_SPI_VS_OUT_CONFIG,
                                   SI_TRACKED_SPI_VS_OUT_CONFIG,
                                   shader->ctx_reg.ngg.spi_vs_out_config);
@@ -1249,11 +1246,6 @@ static void gfx10_shader_ngg(struct si_screen *sscreen, struct si_shader *shader
                        S_028818_VPORT_Y_SCALE_ENA(1) | S_028818_VPORT_Y_OFFSET_ENA(1) |
                        S_028818_VPORT_Z_SCALE_ENA(1) | S_028818_VPORT_Z_OFFSET_ENA(1);
        }
-
-       shader->ctx_reg.ngg.vgt_reuse_off =
-               S_028AB4_REUSE_OFF(sscreen->info.family == CHIP_NAVI10 &&
-                                  sscreen->info.chip_external_rev == 0x1 &&
-                                  es_type == PIPE_SHADER_TESS_EVAL);
 }
 
 static void si_emit_shader_vs(struct si_context *sctx)