radv: fix setting VGT_REUSE_OFF for TES on GFX10
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 9 Jul 2019 06:27:31 +0000 (08:27 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 9 Jul 2019 07:54:16 +0000 (09:54 +0200)
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
src/amd/vulkan/radv_pipeline.c

index 91ce108ef92c34828e59adf8beff37498f70e4a3..d2002dd904be34c5c6eab4ed0e43f536c64621ed 100644 (file)
@@ -3338,6 +3338,8 @@ radv_pipeline_generate_hw_ngg(struct radeon_cmdbuf *ctx_cs,
                              const struct radv_ngg_state *ngg_state)
 {
        uint64_t va = radv_buffer_get_va(shader->bo) + shader->bo_offset;
+       gl_shader_stage es_type =
+               radv_pipeline_has_tess(pipeline) ? MESA_SHADER_TESS_EVAL : MESA_SHADER_VERTEX;
 
        radeon_set_sh_reg_seq(cs, R_00B320_SPI_SHADER_PGM_LO_ES, 2);
        radeon_emit(cs, va >> 8);
@@ -3388,9 +3390,12 @@ radv_pipeline_generate_hw_ngg(struct radeon_cmdbuf *ctx_cs,
                               cull_dist_mask << 8 |
                               clip_dist_mask);
 
-       /* TODO: Correctly set REUSE_OFF */
+       bool vgt_reuse_off = pipeline->device->physical_device->rad_info.family == CHIP_NAVI10 &&
+                            pipeline->device->physical_device->rad_info.chip_external_rev == 0x1 &&
+                            es_type == MESA_SHADER_TESS_EVAL;
+
        radeon_set_context_reg(ctx_cs, R_028AB4_VGT_REUSE_OFF,
-                              S_028AB4_REUSE_OFF(0));
+                              S_028AB4_REUSE_OFF(vgt_reuse_off));
        radeon_set_context_reg(ctx_cs, R_028AAC_VGT_ESGS_RING_ITEMSIZE,
                               ngg_state->vgt_esgs_ring_itemsize);