From f064b530f6f7245e1ae57a63b3b09bef48548623 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 30 Jul 2019 21:42:26 -0400 Subject: [PATCH] radeonsi/gfx10: remove an obsolete VGT_REUSE_OFF workaround Reviewed-by: Samuel Pitoiset Acked-by: Pierre-Eric Pelloux-Prayer --- src/gallium/drivers/radeonsi/si_shader.h | 1 - src/gallium/drivers/radeonsi/si_state_shaders.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index f94bd71cee4..3ce3d4e824a 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -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; diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index e3bb2760e08..d3c3677d82b 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -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) -- 2.30.2