radv: clean up adjusting MSAA state if conservative rast is enabled
[mesa.git] / src / amd / vulkan / radv_pipeline.c
index e598ddbabdda41ff8b5a086d1de4c8a7c0a8d3ae..62fd14d2cc9431ff9901129776e24319ce4fcfa6 100644 (file)
@@ -82,12 +82,6 @@ struct radv_dsa_order_invariance {
        bool pass_set;
 };
 
-struct radv_tessellation_state {
-       uint32_t ls_hs_config;
-       unsigned num_lds_blocks;
-       uint32_t tf_param;
-};
-
 static const VkPipelineMultisampleStateCreateInfo *
 radv_pipeline_get_multisample_state(const VkGraphicsPipelineCreateInfo *pCreateInfo)
 {
@@ -1054,6 +1048,17 @@ radv_pipeline_out_of_order_rast(struct radv_pipeline *pipeline,
        return true;
 }
 
+static const VkConservativeRasterizationModeEXT
+radv_get_conservative_raster_mode(const VkPipelineRasterizationStateCreateInfo *pCreateInfo)
+{
+       const VkPipelineRasterizationConservativeStateCreateInfoEXT *conservative_raster =
+               vk_find_struct_const(pCreateInfo->pNext, PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT);
+
+       if (!conservative_raster)
+               return VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT;
+       return conservative_raster->conservativeRasterizationMode;
+}
+
 static void
 radv_pipeline_init_multisample_state(struct radv_pipeline *pipeline,
                                     struct radv_blend_state *blend,
@@ -1062,6 +1067,8 @@ radv_pipeline_init_multisample_state(struct radv_pipeline *pipeline,
        const VkPipelineMultisampleStateCreateInfo *vkms = radv_pipeline_get_multisample_state(pCreateInfo);
        struct radv_multisample_state *ms = &pipeline->graphics.ms;
        unsigned num_tile_pipes = pipeline->device->physical_device->rad_info.num_tile_pipes;
+       const VkConservativeRasterizationModeEXT mode =
+               radv_get_conservative_raster_mode(pCreateInfo->pRasterizationState);
        bool out_of_order_rast = false;
        int ps_iter_samples = 1;
        uint32_t mask = 0xffff;
@@ -1114,6 +1121,15 @@ radv_pipeline_init_multisample_state(struct radv_pipeline *pipeline,
                      S_028804_INCOHERENT_EQAA_READS(1) |
                      S_028804_INTERPOLATE_COMP_Z(1) |
                      S_028804_STATIC_ANCHOR_ASSOCIATIONS(1);
+
+       /* Adjust MSAA state if conservative rasterization is enabled. */
+       if (mode != VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT) {
+               ms->pa_sc_aa_config |= S_028BE0_AA_MASK_CENTROID_DTMN(1);
+
+               ms->db_eqaa |= S_028804_ENABLE_POSTZ_OVERRASTERIZATION(1) |
+                              S_028804_OVERRASTERIZATION_AMOUNT(4);
+       }
+
        ms->pa_sc_mode_cntl_1 =
                S_028A4C_WALK_FENCE_ENABLE(1) | //TODO linear dst fixes
                S_028A4C_WALK_FENCE_SIZE(num_tile_pipes == 2 ? 2 : 3) |
@@ -1341,6 +1357,31 @@ static uint32_t radv_pipeline_needed_dynamic_state(const VkGraphicsPipelineCreat
        return states;
 }
 
+static void
+radv_pipeline_init_input_assembly_state(struct radv_pipeline *pipeline,
+                                       const VkGraphicsPipelineCreateInfo *pCreateInfo,
+                                       const struct radv_graphics_pipeline_create_info *extra)
+{
+       const VkPipelineInputAssemblyStateCreateInfo *ia_state = pCreateInfo->pInputAssemblyState;
+       struct radv_shader_variant *tes = pipeline->shaders[MESA_SHADER_TESS_EVAL];
+       struct radv_shader_variant *gs = pipeline->shaders[MESA_SHADER_GEOMETRY];
+
+       pipeline->graphics.prim_restart_enable = !!ia_state->primitiveRestartEnable;
+       pipeline->graphics.can_use_guardband = radv_prim_can_use_guardband(ia_state->topology);
+
+       if (radv_pipeline_has_gs(pipeline)) {
+               if (si_conv_gl_prim_to_gs_out(gs->info.gs.output_prim) == V_028A6C_OUTPRIM_TYPE_TRISTRIP)
+                       pipeline->graphics.can_use_guardband = true;
+       } else if (radv_pipeline_has_tess(pipeline)) {
+               if (!tes->info.tes.point_mode &&
+                   si_conv_gl_prim_to_gs_out(tes->info.tes.primitive_mode) == V_028A6C_OUTPRIM_TYPE_TRISTRIP)
+                       pipeline->graphics.can_use_guardband = true;
+       }
+
+       if (extra && extra->use_rectlist) {
+               pipeline->graphics.can_use_guardband = true;
+       }
+}
 
 static void
 radv_pipeline_init_dynamic_state(struct radv_pipeline *pipeline,
@@ -1985,88 +2026,6 @@ radv_get_shader(struct radv_pipeline *pipeline,
        return pipeline->shaders[stage];
 }
 
-static struct radv_tessellation_state
-calculate_tess_state(struct radv_pipeline *pipeline,
-                    const VkGraphicsPipelineCreateInfo *pCreateInfo)
-{
-       unsigned num_tcs_input_cp;
-       unsigned num_tcs_output_cp;
-       unsigned num_patches;
-       struct radv_tessellation_state tess = {0};
-
-       num_tcs_input_cp = pCreateInfo->pTessellationState->patchControlPoints;
-       num_tcs_output_cp = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.tcs_vertices_out; //TCS VERTICES OUT
-       num_patches = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.num_patches;
-
-       tess.num_lds_blocks = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.num_lds_blocks;
-
-       tess.ls_hs_config = S_028B58_NUM_PATCHES(num_patches) |
-               S_028B58_HS_NUM_INPUT_CP(num_tcs_input_cp) |
-               S_028B58_HS_NUM_OUTPUT_CP(num_tcs_output_cp);
-
-       struct radv_shader_variant *tes = radv_get_shader(pipeline, MESA_SHADER_TESS_EVAL);
-       unsigned type = 0, partitioning = 0, topology = 0, distribution_mode = 0;
-
-       switch (tes->info.tes.primitive_mode) {
-       case GL_TRIANGLES:
-               type = V_028B6C_TESS_TRIANGLE;
-               break;
-       case GL_QUADS:
-               type = V_028B6C_TESS_QUAD;
-               break;
-       case GL_ISOLINES:
-               type = V_028B6C_TESS_ISOLINE;
-               break;
-       }
-
-       switch (tes->info.tes.spacing) {
-       case TESS_SPACING_EQUAL:
-               partitioning = V_028B6C_PART_INTEGER;
-               break;
-       case TESS_SPACING_FRACTIONAL_ODD:
-               partitioning = V_028B6C_PART_FRAC_ODD;
-               break;
-       case TESS_SPACING_FRACTIONAL_EVEN:
-               partitioning = V_028B6C_PART_FRAC_EVEN;
-               break;
-       default:
-               break;
-       }
-
-       bool ccw = tes->info.tes.ccw;
-       const VkPipelineTessellationDomainOriginStateCreateInfo *domain_origin_state =
-                     vk_find_struct_const(pCreateInfo->pTessellationState,
-                                          PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO);
-
-       if (domain_origin_state && domain_origin_state->domainOrigin != VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT)
-               ccw = !ccw;
-
-       if (tes->info.tes.point_mode)
-               topology = V_028B6C_OUTPUT_POINT;
-       else if (tes->info.tes.primitive_mode == GL_ISOLINES)
-               topology = V_028B6C_OUTPUT_LINE;
-       else if (ccw)
-               topology = V_028B6C_OUTPUT_TRIANGLE_CCW;
-       else
-               topology = V_028B6C_OUTPUT_TRIANGLE_CW;
-
-       if (pipeline->device->physical_device->rad_info.has_distributed_tess) {
-               if (pipeline->device->physical_device->rad_info.family == CHIP_FIJI ||
-                   pipeline->device->physical_device->rad_info.family >= CHIP_POLARIS10)
-                       distribution_mode = V_028B6C_DISTRIBUTION_MODE_TRAPEZOIDS;
-               else
-                       distribution_mode = V_028B6C_DISTRIBUTION_MODE_DONUTS;
-       } else
-               distribution_mode = V_028B6C_DISTRIBUTION_MODE_NO_DIST;
-
-       tess.tf_param = S_028B6C_TYPE(type) |
-               S_028B6C_PARTITIONING(partitioning) |
-               S_028B6C_TOPOLOGY(topology) |
-               S_028B6C_DISTRIBUTION_MODE(distribution_mode);
-
-       return tess;
-}
-
 static const struct radv_vs_output_info *get_vs_output_info(const struct radv_pipeline *pipeline)
 {
        if (radv_pipeline_has_gs(pipeline))
@@ -3672,17 +3631,6 @@ radv_pipeline_generate_blend_state(struct radeon_cmdbuf *ctx_cs,
        pipeline->graphics.cb_target_mask = blend->cb_target_mask;
 }
 
-static const VkConservativeRasterizationModeEXT
-radv_get_conservative_raster_mode(const VkPipelineRasterizationStateCreateInfo *pCreateInfo)
-{
-       const VkPipelineRasterizationConservativeStateCreateInfoEXT *conservative_raster =
-               vk_find_struct_const(pCreateInfo->pNext, PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT);
-
-       if (!conservative_raster)
-               return VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT;
-       return conservative_raster->conservativeRasterizationMode;
-}
-
 static void
 radv_pipeline_generate_raster_state(struct radeon_cmdbuf *ctx_cs,
                                    struct radv_pipeline *pipeline,
@@ -3723,12 +3671,6 @@ radv_pipeline_generate_raster_state(struct radeon_cmdbuf *ctx_cs,
 
        /* Conservative rasterization. */
        if (mode != VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT) {
-               struct radv_multisample_state *ms = &pipeline->graphics.ms;
-
-               ms->pa_sc_aa_config |= S_028BE0_AA_MASK_CENTROID_DTMN(1);
-               ms->db_eqaa |= S_028804_ENABLE_POSTZ_OVERRASTERIZATION(1) |
-                              S_028804_OVERRASTERIZATION_AMOUNT(4);
-
                pa_sc_conservative_rast = S_028C4C_PREZ_AA_MASK_ENABLE(1) |
                                          S_028C4C_POSTZ_AA_MASK_ENABLE(1) |
                                          S_028C4C_CENTROID_SAMPLE_OVERRIDE(1);
@@ -3897,9 +3839,9 @@ radv_pipeline_generate_hw_es(struct radeon_cmdbuf *cs,
 static void
 radv_pipeline_generate_hw_ls(struct radeon_cmdbuf *cs,
                             struct radv_pipeline *pipeline,
-                            struct radv_shader_variant *shader,
-                            const struct radv_tessellation_state *tess)
+                            struct radv_shader_variant *shader)
 {
+       unsigned num_lds_blocks = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.num_lds_blocks;
        uint64_t va = radv_buffer_get_va(shader->bo) + shader->bo_offset;
        uint32_t rsrc2 = shader->config.rsrc2;
 
@@ -3907,7 +3849,7 @@ radv_pipeline_generate_hw_ls(struct radeon_cmdbuf *cs,
        radeon_emit(cs, va >> 8);
        radeon_emit(cs, S_00B524_MEM_BASE(va >> 40));
 
-       rsrc2 |= S_00B52C_LDS_SIZE(tess->num_lds_blocks);
+       rsrc2 |= S_00B52C_LDS_SIZE(num_lds_blocks);
        if (pipeline->device->physical_device->rad_info.chip_class == GFX7 &&
            pipeline->device->physical_device->rad_info.family != CHIP_HAWAII)
                radeon_set_sh_reg(cs, R_00B52C_SPI_SHADER_PGM_RSRC2_LS, rsrc2);
@@ -4054,20 +3996,11 @@ radv_pipeline_generate_hw_ngg(struct radeon_cmdbuf *ctx_cs,
 static void
 radv_pipeline_generate_hw_hs(struct radeon_cmdbuf *cs,
                             struct radv_pipeline *pipeline,
-                            struct radv_shader_variant *shader,
-                            const struct radv_tessellation_state *tess)
+                            struct radv_shader_variant *shader)
 {
        uint64_t va = radv_buffer_get_va(shader->bo) + shader->bo_offset;
 
        if (pipeline->device->physical_device->rad_info.chip_class >= GFX9) {
-               unsigned hs_rsrc2 = shader->config.rsrc2;
-
-               if (pipeline->device->physical_device->rad_info.chip_class >= GFX10) {
-                       hs_rsrc2 |= S_00B42C_LDS_SIZE_GFX10(tess->num_lds_blocks);
-               } else {
-                       hs_rsrc2 |= S_00B42C_LDS_SIZE_GFX9(tess->num_lds_blocks);
-               }
-
                if (pipeline->device->physical_device->rad_info.chip_class >= GFX10) {
                        radeon_set_sh_reg_seq(cs, R_00B520_SPI_SHADER_PGM_LO_LS, 2);
                        radeon_emit(cs, va >> 8);
@@ -4080,7 +4013,7 @@ radv_pipeline_generate_hw_hs(struct radeon_cmdbuf *cs,
 
                radeon_set_sh_reg_seq(cs, R_00B428_SPI_SHADER_PGM_RSRC1_HS, 2);
                radeon_emit(cs, shader->config.rsrc1);
-               radeon_emit(cs, hs_rsrc2);
+               radeon_emit(cs, shader->config.rsrc2);
        } else {
                radeon_set_sh_reg_seq(cs, R_00B420_SPI_SHADER_PGM_LO_HS, 4);
                radeon_emit(cs, va >> 8);
@@ -4093,8 +4026,7 @@ radv_pipeline_generate_hw_hs(struct radeon_cmdbuf *cs,
 static void
 radv_pipeline_generate_vertex_shader(struct radeon_cmdbuf *ctx_cs,
                                     struct radeon_cmdbuf *cs,
-                                    struct radv_pipeline *pipeline,
-                                    const struct radv_tessellation_state *tess)
+                                    struct radv_pipeline *pipeline)
 {
        struct radv_shader_variant *vs;
 
@@ -4104,7 +4036,7 @@ radv_pipeline_generate_vertex_shader(struct radeon_cmdbuf *ctx_cs,
                return;
 
        if (vs->info.vs.as_ls)
-               radv_pipeline_generate_hw_ls(cs, pipeline, vs, tess);
+               radv_pipeline_generate_hw_ls(cs, pipeline, vs);
        else if (vs->info.vs.as_es)
                radv_pipeline_generate_hw_es(cs, pipeline, vs);
        else if (vs->info.is_ngg)
@@ -4116,12 +4048,8 @@ radv_pipeline_generate_vertex_shader(struct radeon_cmdbuf *ctx_cs,
 static void
 radv_pipeline_generate_tess_shaders(struct radeon_cmdbuf *ctx_cs,
                                    struct radeon_cmdbuf *cs,
-                                   struct radv_pipeline *pipeline,
-                                   const struct radv_tessellation_state *tess)
+                                   struct radv_pipeline *pipeline)
 {
-       if (!radv_pipeline_has_tess(pipeline))
-               return;
-
        struct radv_shader_variant *tes, *tcs;
 
        tcs = pipeline->shaders[MESA_SHADER_TESS_CTRL];
@@ -4136,17 +4064,7 @@ radv_pipeline_generate_tess_shaders(struct radeon_cmdbuf *ctx_cs,
                        radv_pipeline_generate_hw_vs(ctx_cs, cs, pipeline, tes);
        }
 
-       radv_pipeline_generate_hw_hs(cs, pipeline, tcs, tess);
-
-       radeon_set_context_reg(ctx_cs, R_028B6C_VGT_TF_PARAM,
-                              tess->tf_param);
-
-       if (pipeline->device->physical_device->rad_info.chip_class >= GFX7)
-               radeon_set_context_reg_idx(ctx_cs, R_028B58_VGT_LS_HS_CONFIG, 2,
-                                          tess->ls_hs_config);
-       else
-               radeon_set_context_reg(ctx_cs, R_028B58_VGT_LS_HS_CONFIG,
-                                      tess->ls_hs_config);
+       radv_pipeline_generate_hw_hs(cs, pipeline, tcs);
 
        if (pipeline->device->physical_device->rad_info.chip_class >= GFX10 &&
            !radv_pipeline_has_gs(pipeline) && !radv_pipeline_has_ngg(pipeline)) {
@@ -4157,6 +4075,91 @@ radv_pipeline_generate_tess_shaders(struct radeon_cmdbuf *ctx_cs,
        }
 }
 
+static void
+radv_pipeline_generate_tess_state(struct radeon_cmdbuf *ctx_cs,
+                                 struct radv_pipeline *pipeline,
+                                 const VkGraphicsPipelineCreateInfo *pCreateInfo)
+{
+       struct radv_shader_variant *tes = radv_get_shader(pipeline, MESA_SHADER_TESS_EVAL);
+       unsigned type = 0, partitioning = 0, topology = 0, distribution_mode = 0;
+       unsigned num_tcs_input_cp, num_tcs_output_cp, num_patches;
+       unsigned ls_hs_config;
+
+       num_tcs_input_cp = pCreateInfo->pTessellationState->patchControlPoints;
+       num_tcs_output_cp = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.tcs_vertices_out; //TCS VERTICES OUT
+       num_patches = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.num_patches;
+
+       ls_hs_config = S_028B58_NUM_PATCHES(num_patches) |
+                      S_028B58_HS_NUM_INPUT_CP(num_tcs_input_cp) |
+                      S_028B58_HS_NUM_OUTPUT_CP(num_tcs_output_cp);
+
+       if (pipeline->device->physical_device->rad_info.chip_class >= GFX7) {
+               radeon_set_context_reg_idx(ctx_cs, R_028B58_VGT_LS_HS_CONFIG,
+                                          2, ls_hs_config);
+       } else {
+               radeon_set_context_reg(ctx_cs, R_028B58_VGT_LS_HS_CONFIG,
+                                      ls_hs_config);
+       }
+
+       switch (tes->info.tes.primitive_mode) {
+       case GL_TRIANGLES:
+               type = V_028B6C_TESS_TRIANGLE;
+               break;
+       case GL_QUADS:
+               type = V_028B6C_TESS_QUAD;
+               break;
+       case GL_ISOLINES:
+               type = V_028B6C_TESS_ISOLINE;
+               break;
+       }
+
+       switch (tes->info.tes.spacing) {
+       case TESS_SPACING_EQUAL:
+               partitioning = V_028B6C_PART_INTEGER;
+               break;
+       case TESS_SPACING_FRACTIONAL_ODD:
+               partitioning = V_028B6C_PART_FRAC_ODD;
+               break;
+       case TESS_SPACING_FRACTIONAL_EVEN:
+               partitioning = V_028B6C_PART_FRAC_EVEN;
+               break;
+       default:
+               break;
+       }
+
+       bool ccw = tes->info.tes.ccw;
+       const VkPipelineTessellationDomainOriginStateCreateInfo *domain_origin_state =
+                     vk_find_struct_const(pCreateInfo->pTessellationState,
+                                          PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO);
+
+       if (domain_origin_state && domain_origin_state->domainOrigin != VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT)
+               ccw = !ccw;
+
+       if (tes->info.tes.point_mode)
+               topology = V_028B6C_OUTPUT_POINT;
+       else if (tes->info.tes.primitive_mode == GL_ISOLINES)
+               topology = V_028B6C_OUTPUT_LINE;
+       else if (ccw)
+               topology = V_028B6C_OUTPUT_TRIANGLE_CCW;
+       else
+               topology = V_028B6C_OUTPUT_TRIANGLE_CW;
+
+       if (pipeline->device->physical_device->rad_info.has_distributed_tess) {
+               if (pipeline->device->physical_device->rad_info.family == CHIP_FIJI ||
+                   pipeline->device->physical_device->rad_info.family >= CHIP_POLARIS10)
+                       distribution_mode = V_028B6C_DISTRIBUTION_MODE_TRAPEZOIDS;
+               else
+                       distribution_mode = V_028B6C_DISTRIBUTION_MODE_DONUTS;
+       } else
+               distribution_mode = V_028B6C_DISTRIBUTION_MODE_NO_DIST;
+
+       radeon_set_context_reg(ctx_cs, R_028B6C_VGT_TF_PARAM,
+                              S_028B6C_TYPE(type) |
+                              S_028B6C_PARTITIONING(partitioning) |
+                              S_028B6C_TOPOLOGY(topology) |
+                              S_028B6C_DISTRIBUTION_MODE(distribution_mode));
+}
+
 static void
 radv_pipeline_generate_hw_gs(struct radeon_cmdbuf *ctx_cs,
                             struct radeon_cmdbuf *cs,
@@ -4604,13 +4607,40 @@ gfx10_pipeline_generate_ge_cntl(struct radeon_cmdbuf *ctx_cs,
                               S_03096C_BREAK_WAVE_AT_EOI(break_wave_at_eoi));
 }
 
+static void
+radv_pipeline_generate_vgt_gs_out(struct radeon_cmdbuf *ctx_cs,
+                                 struct radv_pipeline *pipeline,
+                                 const VkGraphicsPipelineCreateInfo *pCreateInfo,
+                                 const struct radv_graphics_pipeline_create_info *extra)
+{
+       uint32_t gs_out;
+
+       if (radv_pipeline_has_gs(pipeline)) {
+               gs_out = si_conv_gl_prim_to_gs_out(pipeline->shaders[MESA_SHADER_GEOMETRY]->info.gs.output_prim);
+       } else if (radv_pipeline_has_tess(pipeline)) {
+               if (pipeline->shaders[MESA_SHADER_TESS_EVAL]->info.tes.point_mode) {
+                       gs_out = V_028A6C_OUTPRIM_TYPE_POINTLIST;
+               } else {
+                       gs_out = si_conv_gl_prim_to_gs_out(pipeline->shaders[MESA_SHADER_TESS_EVAL]->info.tes.primitive_mode);
+               }
+       } else {
+               gs_out = si_conv_prim_to_gs_out(pCreateInfo->pInputAssemblyState->topology);
+       }
+
+       if (extra && extra->use_rectlist) {
+               gs_out = V_028A6C_OUTPRIM_TYPE_TRISTRIP;
+               if (radv_pipeline_has_ngg(pipeline))
+                       gs_out = V_028A6C_VGT_OUT_RECT_V0;
+       }
+
+       radeon_set_context_reg(ctx_cs, R_028A6C_VGT_GS_OUT_PRIM_TYPE, gs_out);
+}
+
 static void
 radv_pipeline_generate_pm4(struct radv_pipeline *pipeline,
                            const VkGraphicsPipelineCreateInfo *pCreateInfo,
                            const struct radv_graphics_pipeline_create_info *extra,
-                           const struct radv_blend_state *blend,
-                           const struct radv_tessellation_state *tess,
-                           unsigned gs_out)
+                           const struct radv_blend_state *blend)
 {
        struct radeon_cmdbuf *ctx_cs = &pipeline->ctx_cs;
        struct radeon_cmdbuf *cs = &pipeline->cs;
@@ -4625,8 +4655,13 @@ radv_pipeline_generate_pm4(struct radv_pipeline *pipeline,
        radv_pipeline_generate_raster_state(ctx_cs, pipeline, pCreateInfo);
        radv_pipeline_generate_multisample_state(ctx_cs, pipeline);
        radv_pipeline_generate_vgt_gs_mode(ctx_cs, pipeline);
-       radv_pipeline_generate_vertex_shader(ctx_cs, cs, pipeline, tess);
-       radv_pipeline_generate_tess_shaders(ctx_cs, cs, pipeline, tess);
+       radv_pipeline_generate_vertex_shader(ctx_cs, cs, pipeline);
+
+       if (radv_pipeline_has_tess(pipeline)) {
+               radv_pipeline_generate_tess_shaders(ctx_cs, cs, pipeline);
+               radv_pipeline_generate_tess_state(ctx_cs, pipeline, pCreateInfo);
+       }
+
        radv_pipeline_generate_geometry_shader(ctx_cs, cs, pipeline);
        radv_pipeline_generate_fragment_shader(ctx_cs, cs, pipeline);
        radv_pipeline_generate_ps_inputs(ctx_cs, pipeline);
@@ -4634,12 +4669,11 @@ radv_pipeline_generate_pm4(struct radv_pipeline *pipeline,
        radv_pipeline_generate_binning_state(ctx_cs, pipeline, pCreateInfo, blend);
        radv_pipeline_generate_vgt_shader_config(ctx_cs, pipeline);
        radv_pipeline_generate_cliprect_rule(ctx_cs, pCreateInfo);
+       radv_pipeline_generate_vgt_gs_out(ctx_cs, pipeline, pCreateInfo, extra);
 
        if (pipeline->device->physical_device->rad_info.chip_class >= GFX10 && !radv_pipeline_has_ngg(pipeline))
                gfx10_pipeline_generate_ge_cntl(ctx_cs, pipeline);
 
-       radeon_set_context_reg(ctx_cs, R_028A6C_VGT_GS_OUT_PRIM_TYPE, gs_out);
-
        pipeline->ctx_cs_hash = _mesa_hash_data(ctx_cs->buf, ctx_cs->cdw * 4);
 
        assert(ctx_cs->cdw <= ctx_cs->max_dw);
@@ -4801,30 +4835,7 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
 
        pipeline->graphics.spi_baryc_cntl = S_0286E0_FRONT_FACE_ALL_BITS(1);
        radv_pipeline_init_multisample_state(pipeline, &blend, pCreateInfo);
-       uint32_t gs_out;
-
-       pipeline->graphics.can_use_guardband = radv_prim_can_use_guardband(pCreateInfo->pInputAssemblyState->topology);
-
-       if (radv_pipeline_has_gs(pipeline)) {
-               gs_out = si_conv_gl_prim_to_gs_out(pipeline->shaders[MESA_SHADER_GEOMETRY]->info.gs.output_prim);
-               pipeline->graphics.can_use_guardband = gs_out == V_028A6C_OUTPRIM_TYPE_TRISTRIP;
-       } else if (radv_pipeline_has_tess(pipeline)) {
-               if (pipeline->shaders[MESA_SHADER_TESS_EVAL]->info.tes.point_mode)
-                       gs_out = V_028A6C_OUTPRIM_TYPE_POINTLIST;
-               else
-                       gs_out = si_conv_gl_prim_to_gs_out(pipeline->shaders[MESA_SHADER_TESS_EVAL]->info.tes.primitive_mode);
-               pipeline->graphics.can_use_guardband = gs_out == V_028A6C_OUTPRIM_TYPE_TRISTRIP;
-       } else {
-               gs_out = si_conv_prim_to_gs_out(pCreateInfo->pInputAssemblyState->topology);
-       }
-       if (extra && extra->use_rectlist) {
-               gs_out = V_028A6C_OUTPRIM_TYPE_TRISTRIP;
-               pipeline->graphics.can_use_guardband = true;
-               if (radv_pipeline_has_ngg(pipeline))
-                       gs_out = V_028A6C_VGT_OUT_RECT_V0;
-       }
-       pipeline->graphics.prim_restart_enable = !!pCreateInfo->pInputAssemblyState->primitiveRestartEnable;
-
+       radv_pipeline_init_input_assembly_state(pipeline, pCreateInfo, extra);
        radv_pipeline_init_dynamic_state(pipeline, pCreateInfo, extra);
 
        /* Ensure that some export memory is always allocated, for two reasons:
@@ -4878,11 +4889,9 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
                calculate_gs_ring_sizes(pipeline, &gs->info.gs_ring_info);
        }
 
-       struct radv_tessellation_state tess = {0};
        if (radv_pipeline_has_tess(pipeline)) {
                pipeline->graphics.tess_patch_control_points =
                        pCreateInfo->pTessellationState->patchControlPoints;
-               tess = calculate_tess_state(pipeline, pCreateInfo);
        }
 
        pipeline->graphics.ia_multi_vgt_param = radv_compute_ia_multi_vgt_param_helpers(pipeline);
@@ -4907,7 +4916,7 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
        pipeline->streamout_shader = radv_pipeline_get_streamout_shader(pipeline);
 
        result = radv_pipeline_scratch_init(device, pipeline);
-       radv_pipeline_generate_pm4(pipeline, pCreateInfo, extra, &blend, &tess, gs_out);
+       radv_pipeline_generate_pm4(pipeline, pCreateInfo, extra, &blend);
 
        return result;
 }