radv: dump shader stats with VK_KHR_pipeline_executable_properties
[mesa.git] / src / amd / vulkan / radv_pipeline.c
index 8006b39b1ce43e9831bbe7c1a4fb51304d1eb842..faae8252c93bd6a491e6a662819f11ef452aaff9 100644 (file)
@@ -82,13 +82,6 @@ struct radv_dsa_order_invariance {
        bool pass_set;
 };
 
-struct radv_tessellation_state {
-       uint32_t ls_hs_config;
-       unsigned num_patches;
-       unsigned lds_size;
-       uint32_t tf_param;
-};
-
 static const VkPipelineMultisampleStateCreateInfo *
 radv_pipeline_get_multisample_state(const VkGraphicsPipelineCreateInfo *pCreateInfo)
 {
@@ -229,8 +222,8 @@ static uint32_t get_hash_flags(struct radv_device *device)
        return hash_flags;
 }
 
-static VkResult
-radv_pipeline_scratch_init(struct radv_device *device,
+static void
+radv_pipeline_init_scratch(struct radv_device *device,
                            struct radv_pipeline *pipeline)
 {
        unsigned scratch_bytes_per_wave = 0;
@@ -261,7 +254,6 @@ radv_pipeline_scratch_init(struct radv_device *device,
 
        pipeline->scratch_bytes_per_wave = scratch_bytes_per_wave;
        pipeline->max_waves = max_waves;
-       return VK_SUCCESS;
 }
 
 static uint32_t si_translate_blend_logic_op(VkLogicOp op)
@@ -814,30 +806,6 @@ radv_pipeline_init_blend_state(struct radv_pipeline *pipeline,
        return blend;
 }
 
-static uint32_t si_translate_stencil_op(enum VkStencilOp op)
-{
-       switch (op) {
-       case VK_STENCIL_OP_KEEP:
-               return V_02842C_STENCIL_KEEP;
-       case VK_STENCIL_OP_ZERO:
-               return V_02842C_STENCIL_ZERO;
-       case VK_STENCIL_OP_REPLACE:
-               return V_02842C_STENCIL_REPLACE_TEST;
-       case VK_STENCIL_OP_INCREMENT_AND_CLAMP:
-               return V_02842C_STENCIL_ADD_CLAMP;
-       case VK_STENCIL_OP_DECREMENT_AND_CLAMP:
-               return V_02842C_STENCIL_SUB_CLAMP;
-       case VK_STENCIL_OP_INVERT:
-               return V_02842C_STENCIL_INVERT;
-       case VK_STENCIL_OP_INCREMENT_AND_WRAP:
-               return V_02842C_STENCIL_ADD_WRAP;
-       case VK_STENCIL_OP_DECREMENT_AND_WRAP:
-               return V_02842C_STENCIL_SUB_WRAP;
-       default:
-               return 0;
-       }
-}
-
 static uint32_t si_translate_fill(VkPolygonMode func)
 {
        switch(func) {
@@ -943,6 +911,30 @@ radv_order_invariant_stencil_state(const VkStencilOpState *state)
                radv_order_invariant_stencil_op(state->failOp));
 }
 
+static bool
+radv_pipeline_has_dynamic_ds_states(const VkGraphicsPipelineCreateInfo *pCreateInfo)
+{
+       VkDynamicState ds_states[] = {
+               VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT,
+               VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT,
+               VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT,
+               VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT,
+               VK_DYNAMIC_STATE_STENCIL_OP_EXT,
+       };
+
+       if (pCreateInfo->pDynamicState) {
+               uint32_t count = pCreateInfo->pDynamicState->dynamicStateCount;
+               for (uint32_t i = 0; i < count; i++) {
+                       for (uint32_t j = 0; j < ARRAY_SIZE(ds_states); j++) {
+                               if (pCreateInfo->pDynamicState->pDynamicStates[i] == ds_states[j])
+                                       return true;
+                       }
+               }
+       }
+
+       return false;
+}
+
 static bool
 radv_pipeline_out_of_order_rast(struct radv_pipeline *pipeline,
                                struct radv_blend_state *blend,
@@ -961,6 +953,13 @@ radv_pipeline_out_of_order_rast(struct radv_pipeline *pipeline,
        if (colormask && vkblend && vkblend->logicOpEnable)
                return false;
 
+       /* Be conservative if an extended dynamic depth/stencil state is
+        * enabled because the driver can't update out-of-order rasterization
+        * dynamically.
+        */
+       if (radv_pipeline_has_dynamic_ds_states(pCreateInfo))
+               return false;
+
        /* Default depth/stencil invariance when no attachment is bound. */
        struct radv_dsa_order_invariance dsa_order_invariant = {
                .zs = true, .pass_set = true
@@ -1048,6 +1047,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,
@@ -1056,6 +1066,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;
@@ -1103,12 +1115,20 @@ radv_pipeline_init_multisample_state(struct radv_pipeline *pipeline,
                        radv_pipeline_out_of_order_rast(pipeline, blend, pCreateInfo);
        }
 
-       ms->pa_sc_line_cntl = S_028BDC_DX10_DIAMOND_TEST_ENA(1);
        ms->pa_sc_aa_config = 0;
        ms->db_eqaa = S_028804_HIGH_QUALITY_INTERSECTIONS(1) |
                      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) |
@@ -1192,38 +1212,6 @@ radv_prim_can_use_guardband(enum VkPrimitiveTopology topology)
        }
 }
 
-static uint32_t
-si_translate_prim(enum VkPrimitiveTopology topology)
-{
-       switch (topology) {
-       case VK_PRIMITIVE_TOPOLOGY_POINT_LIST:
-               return V_008958_DI_PT_POINTLIST;
-       case VK_PRIMITIVE_TOPOLOGY_LINE_LIST:
-               return V_008958_DI_PT_LINELIST;
-       case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP:
-               return V_008958_DI_PT_LINESTRIP;
-       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST:
-               return V_008958_DI_PT_TRILIST;
-       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP:
-               return V_008958_DI_PT_TRISTRIP;
-       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN:
-               return V_008958_DI_PT_TRIFAN;
-       case VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY:
-               return V_008958_DI_PT_LINELIST_ADJ;
-       case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY:
-               return V_008958_DI_PT_LINESTRIP_ADJ;
-       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY:
-               return V_008958_DI_PT_TRILIST_ADJ;
-       case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY:
-               return V_008958_DI_PT_TRISTRIP_ADJ;
-       case VK_PRIMITIVE_TOPOLOGY_PATCH_LIST:
-               return V_008958_DI_PT_PATCH;
-       default:
-               assert(0);
-               return 0;
-       }
-}
-
 static uint32_t
 si_conv_gl_prim_to_gs_out(unsigned gl_prim)
 {
@@ -1275,8 +1263,10 @@ static unsigned radv_dynamic_state_mask(VkDynamicState state)
 {
        switch(state) {
        case VK_DYNAMIC_STATE_VIEWPORT:
+       case VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT:
                return RADV_DYNAMIC_VIEWPORT;
        case VK_DYNAMIC_STATE_SCISSOR:
+       case VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT:
                return RADV_DYNAMIC_SCISSOR;
        case VK_DYNAMIC_STATE_LINE_WIDTH:
                return RADV_DYNAMIC_LINE_WIDTH;
@@ -1298,6 +1288,26 @@ static unsigned radv_dynamic_state_mask(VkDynamicState state)
                return RADV_DYNAMIC_SAMPLE_LOCATIONS;
        case VK_DYNAMIC_STATE_LINE_STIPPLE_EXT:
                return RADV_DYNAMIC_LINE_STIPPLE;
+       case VK_DYNAMIC_STATE_CULL_MODE_EXT:
+               return RADV_DYNAMIC_CULL_MODE;
+       case VK_DYNAMIC_STATE_FRONT_FACE_EXT:
+               return RADV_DYNAMIC_FRONT_FACE;
+       case VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT:
+               return RADV_DYNAMIC_PRIMITIVE_TOPOLOGY;
+       case VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT:
+               return RADV_DYNAMIC_DEPTH_TEST_ENABLE;
+       case VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT:
+               return RADV_DYNAMIC_DEPTH_WRITE_ENABLE;
+       case VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT:
+               return RADV_DYNAMIC_DEPTH_COMPARE_OP;
+       case VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT:
+               return RADV_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE;
+       case VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT:
+               return RADV_DYNAMIC_STENCIL_TEST_ENABLE;
+       case VK_DYNAMIC_STATE_STENCIL_OP_EXT:
+               return RADV_DYNAMIC_STENCIL_OP;
+       case VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT:
+               return RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE;
        default:
                unreachable("Unhandled dynamic state");
        }
@@ -1307,10 +1317,13 @@ static uint32_t radv_pipeline_needed_dynamic_state(const VkGraphicsPipelineCreat
 {
        uint32_t states = RADV_DYNAMIC_ALL;
 
-       /* If rasterization is disabled we do not care about any of the dynamic states,
-        * since they are all rasterization related only. */
+       /* If rasterization is disabled we do not care about any of the
+        * dynamic states, since they are all rasterization related only,
+        * except primitive topology and vertex binding stride.
+        */
        if (pCreateInfo->pRasterizationState->rasterizerDiscardEnable)
-               return 0;
+               return RADV_DYNAMIC_PRIMITIVE_TOPOLOGY |
+                      RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE;
 
        if (!pCreateInfo->pRasterizationState->depthBiasEnable)
                states &= ~RADV_DYNAMIC_DEPTH_BIAS;
@@ -1343,10 +1356,120 @@ static uint32_t radv_pipeline_needed_dynamic_state(const VkGraphicsPipelineCreat
        return states;
 }
 
+static struct radv_ia_multi_vgt_param_helpers
+radv_compute_ia_multi_vgt_param_helpers(struct radv_pipeline *pipeline)
+{
+       struct radv_ia_multi_vgt_param_helpers ia_multi_vgt_param = {0};
+       const struct radv_device *device = pipeline->device;
+
+       if (radv_pipeline_has_tess(pipeline))
+               ia_multi_vgt_param.primgroup_size = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.num_patches;
+       else if (radv_pipeline_has_gs(pipeline))
+               ia_multi_vgt_param.primgroup_size = 64;
+       else
+               ia_multi_vgt_param.primgroup_size = 128; /* recommended without a GS */
+
+       /* GS requirement. */
+       ia_multi_vgt_param.partial_es_wave = false;
+       if (radv_pipeline_has_gs(pipeline) && device->physical_device->rad_info.chip_class <= GFX8)
+               if (SI_GS_PER_ES / ia_multi_vgt_param.primgroup_size >= pipeline->device->gs_table_depth - 3)
+                       ia_multi_vgt_param.partial_es_wave = true;
+
+       ia_multi_vgt_param.ia_switch_on_eoi = false;
+       if (pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.prim_id_input)
+               ia_multi_vgt_param.ia_switch_on_eoi = true;
+       if (radv_pipeline_has_gs(pipeline) &&
+           pipeline->shaders[MESA_SHADER_GEOMETRY]->info.uses_prim_id)
+               ia_multi_vgt_param.ia_switch_on_eoi = true;
+       if (radv_pipeline_has_tess(pipeline)) {
+               /* SWITCH_ON_EOI must be set if PrimID is used. */
+               if (pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.uses_prim_id ||
+                   radv_get_shader(pipeline, MESA_SHADER_TESS_EVAL)->info.uses_prim_id)
+                       ia_multi_vgt_param.ia_switch_on_eoi = true;
+       }
+
+       ia_multi_vgt_param.partial_vs_wave = false;
+       if (radv_pipeline_has_tess(pipeline)) {
+               /* Bug with tessellation and GS on Bonaire and older 2 SE chips. */
+               if ((device->physical_device->rad_info.family == CHIP_TAHITI ||
+                    device->physical_device->rad_info.family == CHIP_PITCAIRN ||
+                    device->physical_device->rad_info.family == CHIP_BONAIRE) &&
+                   radv_pipeline_has_gs(pipeline))
+                       ia_multi_vgt_param.partial_vs_wave = true;
+               /* Needed for 028B6C_DISTRIBUTION_MODE != 0 */
+               if (device->physical_device->rad_info.has_distributed_tess) {
+                       if (radv_pipeline_has_gs(pipeline)) {
+                               if (device->physical_device->rad_info.chip_class <= GFX8)
+                                       ia_multi_vgt_param.partial_es_wave = true;
+                       } else {
+                               ia_multi_vgt_param.partial_vs_wave = true;
+                       }
+               }
+       }
+
+       if (radv_pipeline_has_gs(pipeline)) {
+               /* On these chips there is the possibility of a hang if the
+                * pipeline uses a GS and partial_vs_wave is not set.
+                *
+                * This mostly does not hit 4-SE chips, as those typically set
+                * ia_switch_on_eoi and then partial_vs_wave is set for pipelines
+                * with GS due to another workaround.
+                *
+                * Reproducer: https://bugs.freedesktop.org/show_bug.cgi?id=109242
+                */
+               if (device->physical_device->rad_info.family == CHIP_TONGA ||
+                   device->physical_device->rad_info.family == CHIP_FIJI ||
+                   device->physical_device->rad_info.family == CHIP_POLARIS10 ||
+                   device->physical_device->rad_info.family == CHIP_POLARIS11 ||
+                   device->physical_device->rad_info.family == CHIP_POLARIS12 ||
+                   device->physical_device->rad_info.family == CHIP_VEGAM) {
+                       ia_multi_vgt_param.partial_vs_wave = true;
+               }
+       }
+
+       ia_multi_vgt_param.base =
+               S_028AA8_PRIMGROUP_SIZE(ia_multi_vgt_param.primgroup_size - 1) |
+               /* The following field was moved to VGT_SHADER_STAGES_EN in GFX9. */
+               S_028AA8_MAX_PRIMGRP_IN_WAVE(device->physical_device->rad_info.chip_class == GFX8 ? 2 : 0) |
+               S_030960_EN_INST_OPT_BASIC(device->physical_device->rad_info.chip_class >= GFX9) |
+               S_030960_EN_INST_OPT_ADV(device->physical_device->rad_info.chip_class >= GFX9);
+
+       return ia_multi_vgt_param;
+}
+
+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;
+       }
+
+       pipeline->graphics.ia_multi_vgt_param =
+               radv_compute_ia_multi_vgt_param_helpers(pipeline);
+}
 
 static void
 radv_pipeline_init_dynamic_state(struct radv_pipeline *pipeline,
-                                const VkGraphicsPipelineCreateInfo *pCreateInfo)
+                                const VkGraphicsPipelineCreateInfo *pCreateInfo,
+                                const struct radv_graphics_pipeline_create_info *extra)
 {
        uint32_t needed_states = radv_pipeline_needed_dynamic_state(pCreateInfo);
        uint32_t states = needed_states;
@@ -1412,6 +1535,24 @@ radv_pipeline_init_dynamic_state(struct radv_pipeline *pipeline,
                             pCreateInfo->pColorBlendState->blendConstants, 4);
        }
 
+       if (states & RADV_DYNAMIC_CULL_MODE) {
+               dynamic->cull_mode =
+                       pCreateInfo->pRasterizationState->cullMode;
+       }
+
+       if (states & RADV_DYNAMIC_FRONT_FACE) {
+               dynamic->front_face =
+                       pCreateInfo->pRasterizationState->frontFace;
+       }
+
+       if (states & RADV_DYNAMIC_PRIMITIVE_TOPOLOGY) {
+               dynamic->primitive_topology =
+                       si_translate_prim(pCreateInfo->pInputAssemblyState->topology);
+               if (extra && extra->use_rectlist) {
+                       dynamic->primitive_topology = V_008958_DI_PT_RECTLIST;
+               }
+       }
+
        /* If there is no depthstencil attachment, then don't read
         * pDepthStencilState. The Vulkan spec states that pDepthStencilState may
         * be NULL in this case. Even if pDepthStencilState is non-NULL, there is
@@ -1454,6 +1595,51 @@ radv_pipeline_init_dynamic_state(struct radv_pipeline *pipeline,
                        dynamic->stencil_reference.back =
                                pCreateInfo->pDepthStencilState->back.reference;
                }
+
+               if (states & RADV_DYNAMIC_DEPTH_TEST_ENABLE) {
+                       dynamic->depth_test_enable =
+                               pCreateInfo->pDepthStencilState->depthTestEnable;
+               }
+
+               if (states & RADV_DYNAMIC_DEPTH_WRITE_ENABLE) {
+                       dynamic->depth_write_enable =
+                               pCreateInfo->pDepthStencilState->depthWriteEnable;
+               }
+
+               if (states & RADV_DYNAMIC_DEPTH_COMPARE_OP) {
+                       dynamic->depth_compare_op =
+                               pCreateInfo->pDepthStencilState->depthCompareOp;
+               }
+
+               if (states & RADV_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE) {
+                       dynamic->depth_bounds_test_enable =
+                               pCreateInfo->pDepthStencilState->depthBoundsTestEnable;
+               }
+
+               if (states & RADV_DYNAMIC_STENCIL_TEST_ENABLE) {
+                       dynamic->stencil_test_enable =
+                               pCreateInfo->pDepthStencilState->stencilTestEnable;
+               }
+
+               if (states & RADV_DYNAMIC_STENCIL_OP) {
+                       dynamic->stencil_op.front.compare_op =
+                               pCreateInfo->pDepthStencilState->front.compareOp;
+                       dynamic->stencil_op.front.fail_op =
+                               pCreateInfo->pDepthStencilState->front.failOp;
+                       dynamic->stencil_op.front.pass_op =
+                               pCreateInfo->pDepthStencilState->front.passOp;
+                       dynamic->stencil_op.front.depth_fail_op =
+                               pCreateInfo->pDepthStencilState->front.depthFailOp;
+
+                       dynamic->stencil_op.back.compare_op =
+                               pCreateInfo->pDepthStencilState->back.compareOp;
+                       dynamic->stencil_op.back.fail_op =
+                               pCreateInfo->pDepthStencilState->back.failOp;
+                       dynamic->stencil_op.back.pass_op =
+                               pCreateInfo->pDepthStencilState->back.passOp;
+                       dynamic->stencil_op.back.depth_fail_op =
+                               pCreateInfo->pDepthStencilState->back.depthFailOp;
+               }
        }
 
        const  VkPipelineDiscardRectangleStateCreateInfoEXT *discard_rectangle_info =
@@ -1498,9 +1684,66 @@ radv_pipeline_init_dynamic_state(struct radv_pipeline *pipeline,
                dynamic->line_stipple.pattern = rast_line_info->lineStipplePattern;
        }
 
+       if (!(states & RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE))
+               pipeline->graphics.uses_dynamic_stride = true;
+
        pipeline->dynamic_state.mask = states;
 }
 
+static void
+radv_pipeline_init_raster_state(struct radv_pipeline *pipeline,
+                               const VkGraphicsPipelineCreateInfo *pCreateInfo)
+{
+       const VkPipelineRasterizationStateCreateInfo *raster_info =
+               pCreateInfo->pRasterizationState;
+
+       pipeline->graphics.pa_su_sc_mode_cntl =
+               S_028814_FACE(raster_info->frontFace) |
+               S_028814_CULL_FRONT(!!(raster_info->cullMode & VK_CULL_MODE_FRONT_BIT)) |
+               S_028814_CULL_BACK(!!(raster_info->cullMode & VK_CULL_MODE_BACK_BIT)) |
+               S_028814_POLY_MODE(raster_info->polygonMode != VK_POLYGON_MODE_FILL) |
+               S_028814_POLYMODE_FRONT_PTYPE(si_translate_fill(raster_info->polygonMode)) |
+               S_028814_POLYMODE_BACK_PTYPE(si_translate_fill(raster_info->polygonMode)) |
+               S_028814_POLY_OFFSET_FRONT_ENABLE(raster_info->depthBiasEnable ? 1 : 0) |
+               S_028814_POLY_OFFSET_BACK_ENABLE(raster_info->depthBiasEnable ? 1 : 0) |
+               S_028814_POLY_OFFSET_PARA_ENABLE(raster_info->depthBiasEnable ? 1 : 0);
+}
+
+static void
+radv_pipeline_init_depth_stencil_state(struct radv_pipeline *pipeline,
+                                      const VkGraphicsPipelineCreateInfo *pCreateInfo)
+{
+       const VkPipelineDepthStencilStateCreateInfo *ds_info
+               = radv_pipeline_get_depth_stencil_state(pCreateInfo);
+       RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
+       struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
+       struct radv_render_pass_attachment *attachment = NULL;
+       uint32_t db_depth_control = 0;
+
+       if (subpass->depth_stencil_attachment)
+               attachment = pass->attachments + subpass->depth_stencil_attachment->attachment;
+
+       bool has_depth_attachment = attachment && vk_format_is_depth(attachment->format);
+       bool has_stencil_attachment = attachment && vk_format_is_stencil(attachment->format);
+
+       if (ds_info) {
+               if (has_depth_attachment) {
+                       db_depth_control = S_028800_Z_ENABLE(ds_info->depthTestEnable ? 1 : 0) |
+                                          S_028800_Z_WRITE_ENABLE(ds_info->depthWriteEnable ? 1 : 0) |
+                                          S_028800_ZFUNC(ds_info->depthCompareOp) |
+                                          S_028800_DEPTH_BOUNDS_ENABLE(ds_info->depthBoundsTestEnable ? 1 : 0);
+               }
+
+               if (has_stencil_attachment && ds_info->stencilTestEnable) {
+                       db_depth_control |= S_028800_STENCIL_ENABLE(1) | S_028800_BACKFACE_ENABLE(1);
+                       db_depth_control |= S_028800_STENCILFUNC(ds_info->front.compareOp);
+                       db_depth_control |= S_028800_STENCILFUNC_BF(ds_info->back.compareOp);
+               }
+       }
+
+       pipeline->graphics.db_depth_control = db_depth_control;
+}
+
 static void
 gfx9_get_gs_info(const struct radv_pipeline_key *key,
                  const struct radv_pipeline *pipeline,
@@ -1696,6 +1939,7 @@ gfx10_get_ngg_info(const struct radv_pipeline_key *key,
        unsigned gsprim_lds_size = 0;
 
        /* All these are per subgroup: */
+       const unsigned min_esverts = pipeline->device->physical_device->rad_info.chip_class >= GFX10_3 ? 29 : 24;
        bool max_vert_out_per_gs_instance = false;
        unsigned max_esverts_base = 256;
        unsigned max_gsprims_base = 128; /* default prim group size clamp */
@@ -1821,7 +2065,7 @@ gfx10_get_ngg_info(const struct radv_pipeline_key *key,
        }
 
        /* Hardware restriction: minimum value of max_esverts */
-       max_esverts = MAX2(max_esverts, 23 + max_verts_per_prim);
+       max_esverts = MAX2(max_esverts, min_esverts - 1 + max_verts_per_prim);
 
        unsigned max_out_vertices =
                max_vert_out_per_gs_instance ? gs_info->gs.vertices_out :
@@ -1858,12 +2102,12 @@ gfx10_get_ngg_info(const struct radv_pipeline_key *key,
 
        pipeline->graphics.esgs_ring_size = ngg->esgs_ring_size;
 
-       assert(ngg->hw_max_esverts >= 24); /* HW limitation */
+       assert(ngg->hw_max_esverts >= min_esverts); /* HW limitation */
 }
 
 static void
-calculate_gs_ring_sizes(struct radv_pipeline *pipeline,
-                       const struct gfx9_gs_info *gs)
+radv_pipeline_init_gs_ring_state(struct radv_pipeline *pipeline,
+                                const struct gfx9_gs_info *gs)
 {
        struct radv_device *device = pipeline->device;
        unsigned num_se = device->physical_device->rad_info.max_se;
@@ -1898,25 +2142,8 @@ calculate_gs_ring_sizes(struct radv_pipeline *pipeline,
        pipeline->graphics.gsvs_ring_size = MIN2(gsvs_ring_size, max_size);
 }
 
-static void si_multiwave_lds_size_workaround(struct radv_device *device,
-                                            unsigned *lds_size)
-{
-       /* If tessellation is all offchip and on-chip GS isn't used, this
-        * workaround is not needed.
-        */
-       return;
-
-       /* SPI barrier management bug:
-        *   Make sure we have at least 4k of LDS in use to avoid the bug.
-        *   It applies to workgroup sizes of more than one wavefront.
-        */
-       if (device->physical_device->rad_info.family == CHIP_BONAIRE ||
-           device->physical_device->rad_info.family == CHIP_KABINI)
-               *lds_size = MAX2(*lds_size, 8);
-}
-
 struct radv_shader_variant *
-radv_get_shader(struct radv_pipeline *pipeline,
+radv_get_shader(const struct radv_pipeline *pipeline,
                gl_shader_stage stage)
 {
        if (stage == MESA_SHADER_VERTEX) {
@@ -1937,143 +2164,48 @@ 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)
+static const struct radv_vs_output_info *get_vs_output_info(const struct radv_pipeline *pipeline)
 {
-       unsigned num_tcs_input_cp;
-       unsigned num_tcs_output_cp;
-       unsigned lds_size;
-       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;
+       if (radv_pipeline_has_gs(pipeline))
+               if (radv_pipeline_has_ngg(pipeline))
+                       return &pipeline->shaders[MESA_SHADER_GEOMETRY]->info.vs.outinfo;
+               else
+                       return &pipeline->gs_copy_shader->info.vs.outinfo;
+       else if (radv_pipeline_has_tess(pipeline))
+               return &pipeline->shaders[MESA_SHADER_TESS_EVAL]->info.tes.outinfo;
+       else
+               return &pipeline->shaders[MESA_SHADER_VERTEX]->info.vs.outinfo;
+}
 
-       lds_size = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.lds_size;
+static void
+radv_link_shaders(struct radv_pipeline *pipeline, nir_shader **shaders)
+{
+       nir_shader* ordered_shaders[MESA_SHADER_STAGES];
+       int shader_count = 0;
 
-       if (pipeline->device->physical_device->rad_info.chip_class >= GFX7) {
-               assert(lds_size <= 65536);
-               lds_size = align(lds_size, 512) / 512;
-       } else {
-               assert(lds_size <= 32768);
-               lds_size = align(lds_size, 256) / 256;
+       if(shaders[MESA_SHADER_FRAGMENT]) {
+               ordered_shaders[shader_count++] = shaders[MESA_SHADER_FRAGMENT];
+       }
+       if(shaders[MESA_SHADER_GEOMETRY]) {
+               ordered_shaders[shader_count++] = shaders[MESA_SHADER_GEOMETRY];
+       }
+       if(shaders[MESA_SHADER_TESS_EVAL]) {
+               ordered_shaders[shader_count++] = shaders[MESA_SHADER_TESS_EVAL];
+       }
+       if(shaders[MESA_SHADER_TESS_CTRL]) {
+               ordered_shaders[shader_count++] = shaders[MESA_SHADER_TESS_CTRL];
+       }
+       if(shaders[MESA_SHADER_VERTEX]) {
+               ordered_shaders[shader_count++] = shaders[MESA_SHADER_VERTEX];
        }
-       si_multiwave_lds_size_workaround(pipeline->device, &lds_size);
 
-       tess.lds_size = lds_size;
+       if (shader_count > 1) {
+               unsigned first = ordered_shaders[shader_count - 1]->info.stage;
+               unsigned last = ordered_shaders[0]->info.stage;
 
-       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);
-       tess.num_patches = num_patches;
-
-       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))
-               if (radv_pipeline_has_ngg(pipeline))
-                       return &pipeline->shaders[MESA_SHADER_GEOMETRY]->info.vs.outinfo;
-               else
-                       return &pipeline->gs_copy_shader->info.vs.outinfo;
-       else if (radv_pipeline_has_tess(pipeline))
-               return &pipeline->shaders[MESA_SHADER_TESS_EVAL]->info.tes.outinfo;
-       else
-               return &pipeline->shaders[MESA_SHADER_VERTEX]->info.vs.outinfo;
-}
-
-static void
-radv_link_shaders(struct radv_pipeline *pipeline, nir_shader **shaders)
-{
-       nir_shader* ordered_shaders[MESA_SHADER_STAGES];
-       int shader_count = 0;
-
-       if(shaders[MESA_SHADER_FRAGMENT]) {
-               ordered_shaders[shader_count++] = shaders[MESA_SHADER_FRAGMENT];
-       }
-       if(shaders[MESA_SHADER_GEOMETRY]) {
-               ordered_shaders[shader_count++] = shaders[MESA_SHADER_GEOMETRY];
-       }
-       if(shaders[MESA_SHADER_TESS_EVAL]) {
-               ordered_shaders[shader_count++] = shaders[MESA_SHADER_TESS_EVAL];
-       }
-       if(shaders[MESA_SHADER_TESS_CTRL]) {
-               ordered_shaders[shader_count++] = shaders[MESA_SHADER_TESS_CTRL];
-       }
-       if(shaders[MESA_SHADER_VERTEX]) {
-               ordered_shaders[shader_count++] = shaders[MESA_SHADER_VERTEX];
-       }
-
-       if (shader_count > 1) {
-               unsigned first = ordered_shaders[shader_count - 1]->info.stage;
-               unsigned last = ordered_shaders[0]->info.stage;
-
-               if (ordered_shaders[0]->info.stage == MESA_SHADER_FRAGMENT &&
-                   ordered_shaders[1]->info.has_transform_feedback_varyings)
-                       nir_link_xfb_varyings(ordered_shaders[1], ordered_shaders[0]);
+               if (ordered_shaders[0]->info.stage == MESA_SHADER_FRAGMENT &&
+                   ordered_shaders[1]->info.has_transform_feedback_varyings)
+                       nir_link_xfb_varyings(ordered_shaders[1], ordered_shaders[0]);
 
                for (int i = 0; i < shader_count; ++i)  {
                        nir_variable_mode mask = 0;
@@ -2190,9 +2322,10 @@ radv_get_attrib_stride(const VkPipelineVertexInputStateCreateInfo *input_state,
 static struct radv_pipeline_key
 radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline,
                                     const VkGraphicsPipelineCreateInfo *pCreateInfo,
-                                    const struct radv_blend_state *blend,
-                                    bool has_view_index)
+                                    const struct radv_blend_state *blend)
 {
+       RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
+       struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
        const VkPipelineVertexInputStateCreateInfo *input_state =
                                                 pCreateInfo->pVertexInputState;
        const VkPipelineVertexInputDivisorStateCreateInfoEXT *divisor_state =
@@ -2204,7 +2337,7 @@ radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline,
        if (pCreateInfo->flags & VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT)
                key.optimisations_disabled = 1;
 
-       key.has_multiview_view_index = has_view_index;
+       key.has_multiview_view_index = !!subpass->view_mask;
 
        uint32_t binding_input_rate = 0;
        uint32_t instance_rate_divisors[MAX_VERTEX_ATTRIBS];
@@ -2492,7 +2625,7 @@ radv_fill_shader_info(struct radv_pipeline *pipeline,
                                          pipeline->layout,
                                          &keys[MESA_SHADER_FRAGMENT],
                                          &infos[MESA_SHADER_FRAGMENT],
-                                         pipeline->device->physical_device->use_llvm);
+                                         radv_use_llvm_for_stage(pipeline->device, MESA_SHADER_FRAGMENT));
 
                /* TODO: These are no longer used as keys we should refactor this */
                keys[MESA_SHADER_VERTEX].vs_common_out.export_prim_id =
@@ -2544,7 +2677,7 @@ radv_fill_shader_info(struct radv_pipeline *pipeline,
                        radv_nir_shader_info_pass(combined_nir[i],
                                                  pipeline->layout, &key,
                                                  &infos[MESA_SHADER_TESS_CTRL],
-                                                 pipeline->device->physical_device->use_llvm);
+                                                 radv_use_llvm_for_stage(pipeline->device, MESA_SHADER_TESS_CTRL));
                }
 
                keys[MESA_SHADER_TESS_EVAL].tes.num_patches =
@@ -2568,7 +2701,7 @@ radv_fill_shader_info(struct radv_pipeline *pipeline,
                                                  pipeline->layout,
                                                  &keys[pre_stage],
                                                  &infos[MESA_SHADER_GEOMETRY],
-                                                 pipeline->device->physical_device->use_llvm);
+                                                 radv_use_llvm_for_stage(pipeline->device, MESA_SHADER_GEOMETRY));
                }
 
                filled_stages |= (1 << pre_stage);
@@ -2593,7 +2726,8 @@ radv_fill_shader_info(struct radv_pipeline *pipeline,
 
                radv_nir_shader_info_init(&infos[i]);
                radv_nir_shader_info_pass(nir[i], pipeline->layout,
-                                         &keys[i], &infos[i], pipeline->device->physical_device->use_llvm);
+                                         &keys[i], &infos[i],
+                                         radv_use_llvm_for_stage(pipeline->device, i));
        }
 
        for (int i = 0; i < MESA_SHADER_STAGES; i++) {
@@ -2803,7 +2937,7 @@ VkResult radv_create_shaders(struct radv_pipeline *pipeline,
                        /* do this again since information such as outputs_read can be out-of-date */
                        nir_shader_gather_info(nir[i], nir_shader_get_entrypoint(nir[i]));
 
-                       if (device->physical_device->use_llvm) {
+                       if (radv_use_llvm_for_stage(device, i)) {
                                NIR_PASS_V(nir[i], nir_lower_bool_to_int32);
                        } else {
                                NIR_PASS_V(nir[i], nir_lower_non_uniform_access,
@@ -2812,6 +2946,7 @@ VkResult radv_create_shaders(struct radv_pipeline *pipeline,
                                           nir_lower_non_uniform_texture_access |
                                           nir_lower_non_uniform_image_access);
                        }
+                       NIR_PASS_V(nir[i], nir_lower_memory_model);
                }
        }
 
@@ -2860,7 +2995,8 @@ VkResult radv_create_shaders(struct radv_pipeline *pipeline,
 
                        radv_nir_shader_info_pass(nir[MESA_SHADER_GEOMETRY],
                                                  pipeline->layout, &key,
-                                                 &info, pipeline->device->physical_device->use_llvm);
+                                                 &info,
+                                                 radv_use_llvm_for_stage(pipeline->device, MESA_SHADER_GEOMETRY));
                        info.wave_size = 64; /* Wave32 not supported. */
                        info.ballot_bit_size = 64;
 
@@ -2968,10 +3104,9 @@ VkResult radv_create_shaders(struct radv_pipeline *pipeline,
                if (nir[i]) {
                        ralloc_free(nir[i]);
 
-                       if (radv_can_dump_shader_stats(device, modules[i]))
-                               radv_shader_dump_stats(device,
-                                                      pipeline->shaders[i],
-                                                      i, stderr);
+                       if (radv_can_dump_shader_stats(device, modules[i])) {
+                               radv_dump_shader_stats(device, pipeline, i, stderr);
+                       }
                }
        }
 
@@ -3409,9 +3544,8 @@ radv_gfx10_compute_bin_size(struct radv_pipeline *pipeline, const VkGraphicsPipe
 }
 
 static void
-radv_pipeline_generate_disabled_binning_state(struct radeon_cmdbuf *ctx_cs,
-                                             struct radv_pipeline *pipeline,
-                                             const VkGraphicsPipelineCreateInfo *pCreateInfo)
+radv_pipeline_init_disabled_binning_state(struct radv_pipeline *pipeline,
+                                         const VkGraphicsPipelineCreateInfo *pCreateInfo)
 {
        uint32_t pa_sc_binner_cntl_0 =
                        S_028C44_BINNING_MODE(V_028C44_DISABLE_BINNING_USE_LEGACY_SC) |
@@ -3481,10 +3615,9 @@ radv_get_binning_settings(const struct radv_physical_device *pdev)
 }
 
 static void
-radv_pipeline_generate_binning_state(struct radeon_cmdbuf *ctx_cs,
-                                    struct radv_pipeline *pipeline,
-                                    const VkGraphicsPipelineCreateInfo *pCreateInfo,
-                                    const struct radv_blend_state *blend)
+radv_pipeline_init_binning_state(struct radv_pipeline *pipeline,
+                                const VkGraphicsPipelineCreateInfo *pCreateInfo,
+                                const struct radv_blend_state *blend)
 {
        if (pipeline->device->physical_device->rad_info.chip_class < GFX9)
                return;
@@ -3529,13 +3662,13 @@ radv_pipeline_generate_binning_state(struct radeon_cmdbuf *ctx_cs,
                pipeline->graphics.binning.pa_sc_binner_cntl_0 = pa_sc_binner_cntl_0;
                pipeline->graphics.binning.db_dfsm_control = db_dfsm_control;
        } else
-               radv_pipeline_generate_disabled_binning_state(ctx_cs, pipeline, pCreateInfo);
+               radv_pipeline_init_disabled_binning_state(pipeline, pCreateInfo);
 }
 
 
 static void
 radv_pipeline_generate_depth_stencil_state(struct radeon_cmdbuf *ctx_cs,
-                                           struct radv_pipeline *pipeline,
+                                           const struct radv_pipeline *pipeline,
                                            const VkGraphicsPipelineCreateInfo *pCreateInfo,
                                            const struct radv_graphics_pipeline_create_info *extra)
 {
@@ -3544,7 +3677,6 @@ radv_pipeline_generate_depth_stencil_state(struct radeon_cmdbuf *ctx_cs,
        struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
        struct radv_shader_variant *ps = pipeline->shaders[MESA_SHADER_FRAGMENT];
        struct radv_render_pass_attachment *attachment = NULL;
-       uint32_t db_depth_control = 0, db_stencil_control = 0;
        uint32_t db_render_control = 0, db_render_override2 = 0;
        uint32_t db_render_override = 0;
 
@@ -3552,14 +3684,8 @@ radv_pipeline_generate_depth_stencil_state(struct radeon_cmdbuf *ctx_cs,
                attachment = pass->attachments + subpass->depth_stencil_attachment->attachment;
 
        bool has_depth_attachment = attachment && vk_format_is_depth(attachment->format);
-       bool has_stencil_attachment = attachment && vk_format_is_stencil(attachment->format);
 
        if (vkds && has_depth_attachment) {
-               db_depth_control = S_028800_Z_ENABLE(vkds->depthTestEnable ? 1 : 0) |
-                                  S_028800_Z_WRITE_ENABLE(vkds->depthWriteEnable ? 1 : 0) |
-                                  S_028800_ZFUNC(vkds->depthCompareOp) |
-                                  S_028800_DEPTH_BOUNDS_ENABLE(vkds->depthBoundsTestEnable ? 1 : 0);
-
                /* from amdvlk: For 4xAA and 8xAA need to decompress on flush for better performance */
                db_render_override2 |= S_028010_DECOMPRESS_Z_ON_FLUSH(attachment->samples > 2);
 
@@ -3567,19 +3693,6 @@ radv_pipeline_generate_depth_stencil_state(struct radeon_cmdbuf *ctx_cs,
                        db_render_override2 |= S_028010_CENTROID_COMPUTATION_MODE_GFX103(2);
        }
 
-       if (has_stencil_attachment && vkds && vkds->stencilTestEnable) {
-               db_depth_control |= S_028800_STENCIL_ENABLE(1) | S_028800_BACKFACE_ENABLE(1);
-               db_depth_control |= S_028800_STENCILFUNC(vkds->front.compareOp);
-               db_stencil_control |= S_02842C_STENCILFAIL(si_translate_stencil_op(vkds->front.failOp));
-               db_stencil_control |= S_02842C_STENCILZPASS(si_translate_stencil_op(vkds->front.passOp));
-               db_stencil_control |= S_02842C_STENCILZFAIL(si_translate_stencil_op(vkds->front.depthFailOp));
-
-               db_depth_control |= S_028800_STENCILFUNC_BF(vkds->back.compareOp);
-               db_stencil_control |= S_02842C_STENCILFAIL_BF(si_translate_stencil_op(vkds->back.failOp));
-               db_stencil_control |= S_02842C_STENCILZPASS_BF(si_translate_stencil_op(vkds->back.passOp));
-               db_stencil_control |= S_02842C_STENCILZFAIL_BF(si_translate_stencil_op(vkds->back.depthFailOp));
-       }
-
        if (attachment && extra) {
                db_render_control |= S_028000_DEPTH_CLEAR_ENABLE(extra->db_depth_clear);
                db_render_control |= S_028000_STENCIL_CLEAR_ENABLE(extra->db_stencil_clear);
@@ -3609,9 +3722,6 @@ radv_pipeline_generate_depth_stencil_state(struct radeon_cmdbuf *ctx_cs,
                db_render_override |= S_02800C_DISABLE_VIEWPORT_CLAMP(1);
        }
 
-       radeon_set_context_reg(ctx_cs, R_028800_DB_DEPTH_CONTROL, db_depth_control);
-       radeon_set_context_reg(ctx_cs, R_02842C_DB_STENCIL_CONTROL, db_stencil_control);
-
        radeon_set_context_reg(ctx_cs, R_028000_DB_RENDER_CONTROL, db_render_control);
        radeon_set_context_reg(ctx_cs, R_02800C_DB_RENDER_OVERRIDE, db_render_override);
        radeon_set_context_reg(ctx_cs, R_028010_DB_RENDER_OVERRIDE2, db_render_override2);
@@ -3619,7 +3729,7 @@ radv_pipeline_generate_depth_stencil_state(struct radeon_cmdbuf *ctx_cs,
 
 static void
 radv_pipeline_generate_blend_state(struct radeon_cmdbuf *ctx_cs,
-                                   struct radv_pipeline *pipeline,
+                                   const struct radv_pipeline *pipeline,
                                    const struct radv_blend_state *blend)
 {
        radeon_set_context_reg_seq(ctx_cs, R_028780_CB_BLEND0_CONTROL, 8);
@@ -3638,25 +3748,11 @@ radv_pipeline_generate_blend_state(struct radeon_cmdbuf *ctx_cs,
 
        radeon_set_context_reg(ctx_cs, R_028238_CB_TARGET_MASK, blend->cb_target_mask);
        radeon_set_context_reg(ctx_cs, R_02823C_CB_SHADER_MASK, blend->cb_shader_mask);
-
-       pipeline->graphics.col_format = blend->spi_shader_col_format;
-       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,
+                                   const struct radv_pipeline *pipeline,
                                     const VkGraphicsPipelineCreateInfo *pCreateInfo)
 {
        const VkPipelineRasterizationStateCreateInfo *vkraster = pCreateInfo->pRasterizationState;
@@ -3678,39 +3774,11 @@ radv_pipeline_generate_raster_state(struct radeon_cmdbuf *ctx_cs,
                               S_028810_DX_RASTERIZATION_KILL(vkraster->rasterizerDiscardEnable ? 1 : 0) |
                               S_028810_DX_LINEAR_ATTR_CLIP_ENA(1));
 
-       radeon_set_context_reg(ctx_cs, R_0286D4_SPI_INTERP_CONTROL_0,
-                              S_0286D4_FLAT_SHADE_ENA(1) |
-                              S_0286D4_PNT_SPRITE_ENA(1) |
-                              S_0286D4_PNT_SPRITE_OVRD_X(V_0286D4_SPI_PNT_SPRITE_SEL_S) |
-                              S_0286D4_PNT_SPRITE_OVRD_Y(V_0286D4_SPI_PNT_SPRITE_SEL_T) |
-                              S_0286D4_PNT_SPRITE_OVRD_Z(V_0286D4_SPI_PNT_SPRITE_SEL_0) |
-                              S_0286D4_PNT_SPRITE_OVRD_W(V_0286D4_SPI_PNT_SPRITE_SEL_1) |
-                              S_0286D4_PNT_SPRITE_TOP_1(0)); /* vulkan is top to bottom - 1.0 at bottom */
-
-       radeon_set_context_reg(ctx_cs, R_028BE4_PA_SU_VTX_CNTL,
-                              S_028BE4_PIX_CENTER(1) | // TODO verify
-                              S_028BE4_ROUND_MODE(V_028BE4_X_ROUND_TO_EVEN) |
-                              S_028BE4_QUANT_MODE(V_028BE4_X_16_8_FIXED_POINT_1_256TH));
-
-       radeon_set_context_reg(ctx_cs, R_028814_PA_SU_SC_MODE_CNTL,
-                              S_028814_FACE(vkraster->frontFace) |
-                              S_028814_CULL_FRONT(!!(vkraster->cullMode & VK_CULL_MODE_FRONT_BIT)) |
-                              S_028814_CULL_BACK(!!(vkraster->cullMode & VK_CULL_MODE_BACK_BIT)) |
-                              S_028814_POLY_MODE(vkraster->polygonMode != VK_POLYGON_MODE_FILL) |
-                              S_028814_POLYMODE_FRONT_PTYPE(si_translate_fill(vkraster->polygonMode)) |
-                              S_028814_POLYMODE_BACK_PTYPE(si_translate_fill(vkraster->polygonMode)) |
-                              S_028814_POLY_OFFSET_FRONT_ENABLE(vkraster->depthBiasEnable ? 1 : 0) |
-                              S_028814_POLY_OFFSET_BACK_ENABLE(vkraster->depthBiasEnable ? 1 : 0) |
-                              S_028814_POLY_OFFSET_PARA_ENABLE(vkraster->depthBiasEnable ? 1 : 0));
+       radeon_set_context_reg(ctx_cs, R_028BDC_PA_SC_LINE_CNTL,
+                              S_028BDC_DX10_DIAMOND_TEST_ENA(1));
 
        /* 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);
@@ -3740,9 +3808,9 @@ radv_pipeline_generate_raster_state(struct radeon_cmdbuf *ctx_cs,
 
 static void
 radv_pipeline_generate_multisample_state(struct radeon_cmdbuf *ctx_cs,
-                                         struct radv_pipeline *pipeline)
+                                         const struct radv_pipeline *pipeline)
 {
-       struct radv_multisample_state *ms = &pipeline->graphics.ms;
+       const struct radv_multisample_state *ms = &pipeline->graphics.ms;
 
        radeon_set_context_reg_seq(ctx_cs, R_028C38_PA_SC_AA_MASK_X0Y0_X1Y0, 2);
        radeon_emit(ctx_cs, ms->pa_sc_aa_mask[0]);
@@ -3751,7 +3819,6 @@ radv_pipeline_generate_multisample_state(struct radeon_cmdbuf *ctx_cs,
        radeon_set_context_reg(ctx_cs, R_028804_DB_EQAA, ms->db_eqaa);
        radeon_set_context_reg(ctx_cs, R_028A48_PA_SC_MODE_CNTL_0, ms->pa_sc_mode_cntl_0);
        radeon_set_context_reg(ctx_cs, R_028A4C_PA_SC_MODE_CNTL_1, ms->pa_sc_mode_cntl_1);
-       radeon_set_context_reg(ctx_cs, R_028BDC_PA_SC_LINE_CNTL, ms->pa_sc_line_cntl);
        radeon_set_context_reg(ctx_cs, R_028BE0_PA_SC_AA_CONFIG, ms->pa_sc_aa_config);
 
        /* The exclusion bits can be set to improve rasterization efficiency
@@ -3772,7 +3839,7 @@ radv_pipeline_generate_multisample_state(struct radeon_cmdbuf *ctx_cs,
 
 static void
 radv_pipeline_generate_vgt_gs_mode(struct radeon_cmdbuf *ctx_cs,
-                                   struct radv_pipeline *pipeline)
+                                   const struct radv_pipeline *pipeline)
 {
        const struct radv_vs_output_info *outinfo = get_vs_output_info(pipeline);
        const struct radv_shader_variant *vs =
@@ -3803,8 +3870,8 @@ radv_pipeline_generate_vgt_gs_mode(struct radeon_cmdbuf *ctx_cs,
 static void
 radv_pipeline_generate_hw_vs(struct radeon_cmdbuf *ctx_cs,
                             struct radeon_cmdbuf *cs,
-                            struct radv_pipeline *pipeline,
-                            struct radv_shader_variant *shader)
+                            const struct radv_pipeline *pipeline,
+                            const struct radv_shader_variant *shader)
 {
        uint64_t va = radv_buffer_get_va(shader->bo) + shader->bo_offset;
 
@@ -3846,12 +3913,6 @@ radv_pipeline_generate_hw_vs(struct radeon_cmdbuf *ctx_cs,
                                                           V_02870C_SPI_SHADER_4COMP :
                                                           V_02870C_SPI_SHADER_NONE));
 
-       radeon_set_context_reg(ctx_cs, R_028818_PA_CL_VTE_CNTL,
-                              S_028818_VTX_W0_FMT(1) |
-                              S_028818_VPORT_X_SCALE_ENA(1) | S_028818_VPORT_X_OFFSET_ENA(1) |
-                              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));
-
        radeon_set_context_reg(ctx_cs, R_02881C_PA_CL_VS_OUT_CNTL,
                               S_02881C_USE_VTX_POINT_SIZE(outinfo->writes_pointsize) |
                               S_02881C_USE_VTX_RENDER_TARGET_INDX(outinfo->writes_layer) |
@@ -3861,6 +3922,7 @@ radv_pipeline_generate_hw_vs(struct radeon_cmdbuf *ctx_cs,
                               S_02881C_VS_OUT_CCDIST0_VEC_ENA((total_mask & 0x0f) != 0) |
                               S_02881C_VS_OUT_CCDIST1_VEC_ENA((total_mask & 0xf0) != 0) |
                               S_02881C_BYPASS_PRIM_RATE_COMBINER_GFX103(pipeline->device->physical_device->rad_info.chip_class >= GFX10_3) |
+                              S_02881C_BYPASS_VTX_RATE_COMBINER_GFX103(pipeline->device->physical_device->rad_info.chip_class >= GFX10_3) |
                               cull_dist_mask << 8 |
                               clip_dist_mask);
 
@@ -3871,8 +3933,8 @@ radv_pipeline_generate_hw_vs(struct radeon_cmdbuf *ctx_cs,
 
 static void
 radv_pipeline_generate_hw_es(struct radeon_cmdbuf *cs,
-                            struct radv_pipeline *pipeline,
-                            struct radv_shader_variant *shader)
+                            const struct radv_pipeline *pipeline,
+                            const struct radv_shader_variant *shader)
 {
        uint64_t va = radv_buffer_get_va(shader->bo) + shader->bo_offset;
 
@@ -3885,10 +3947,10 @@ 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)
+                            const struct radv_pipeline *pipeline,
+                            const 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;
 
@@ -3896,7 +3958,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->lds_size);
+       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);
@@ -3909,8 +3971,8 @@ radv_pipeline_generate_hw_ls(struct radeon_cmdbuf *cs,
 static void
 radv_pipeline_generate_hw_ngg(struct radeon_cmdbuf *ctx_cs,
                              struct radeon_cmdbuf *cs,
-                             struct radv_pipeline *pipeline,
-                             struct radv_shader_variant *shader)
+                             const struct radv_pipeline *pipeline,
+                             const struct radv_shader_variant *shader)
 {
        uint64_t va = radv_buffer_get_va(shader->bo) + shader->bo_offset;
        gl_shader_stage es_type =
@@ -3967,11 +4029,6 @@ radv_pipeline_generate_hw_ngg(struct radeon_cmdbuf *ctx_cs,
                                                           V_02870C_SPI_SHADER_4COMP :
                                                           V_02870C_SPI_SHADER_NONE));
 
-       radeon_set_context_reg(ctx_cs, R_028818_PA_CL_VTE_CNTL,
-                              S_028818_VTX_W0_FMT(1) |
-                              S_028818_VPORT_X_SCALE_ENA(1) | S_028818_VPORT_X_OFFSET_ENA(1) |
-                              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));
        radeon_set_context_reg(ctx_cs, R_02881C_PA_CL_VS_OUT_CNTL,
                               S_02881C_USE_VTX_POINT_SIZE(outinfo->writes_pointsize) |
                               S_02881C_USE_VTX_RENDER_TARGET_INDX(outinfo->writes_layer) |
@@ -3981,6 +4038,7 @@ radv_pipeline_generate_hw_ngg(struct radeon_cmdbuf *ctx_cs,
                               S_02881C_VS_OUT_CCDIST0_VEC_ENA((total_mask & 0x0f) != 0) |
                               S_02881C_VS_OUT_CCDIST1_VEC_ENA((total_mask & 0xf0) != 0) |
                               S_02881C_BYPASS_PRIM_RATE_COMBINER_GFX103(pipeline->device->physical_device->rad_info.chip_class >= GFX10_3) |
+                              S_02881C_BYPASS_VTX_RATE_COMBINER_GFX103(pipeline->device->physical_device->rad_info.chip_class >= GFX10_3) |
                               cull_dist_mask << 8 |
                               clip_dist_mask);
 
@@ -4047,21 +4105,12 @@ 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)
+                            const struct radv_pipeline *pipeline,
+                            const 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->lds_size);
-               } else {
-                       hs_rsrc2 |= S_00B42C_LDS_SIZE_GFX9(tess->lds_size);
-               }
-
                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);
@@ -4074,7 +4123,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);
@@ -4087,8 +4136,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)
+                                    const struct radv_pipeline *pipeline)
 {
        struct radv_shader_variant *vs;
 
@@ -4098,7 +4146,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)
@@ -4110,12 +4158,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)
+                                   const struct radv_pipeline *pipeline)
 {
-       if (!radv_pipeline_has_tess(pipeline))
-               return;
-
        struct radv_shader_variant *tes, *tcs;
 
        tcs = pipeline->shaders[MESA_SHADER_TESS_CTRL];
@@ -4130,17 +4174,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)) {
@@ -4151,15 +4185,100 @@ radv_pipeline_generate_tess_shaders(struct radeon_cmdbuf *ctx_cs,
        }
 }
 
+static void
+radv_pipeline_generate_tess_state(struct radeon_cmdbuf *ctx_cs,
+                                 const 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,
-                            struct radv_pipeline *pipeline,
-                            struct radv_shader_variant *gs)
+                            const struct radv_pipeline *pipeline,
+                            const struct radv_shader_variant *gs)
 {
        const struct gfx9_gs_info *gs_state = &gs->info.gs_ring_info;
        unsigned gs_max_out_vertices;
-       uint8_t *num_components;
+       const uint8_t *num_components;
        uint8_t max_stream;
        unsigned offset;
        uint64_t va;
@@ -4229,7 +4348,7 @@ radv_pipeline_generate_hw_gs(struct radeon_cmdbuf *ctx_cs,
 static void
 radv_pipeline_generate_geometry_shader(struct radeon_cmdbuf *ctx_cs,
                                       struct radeon_cmdbuf *cs,
-                                      struct radv_pipeline *pipeline)
+                                      const struct radv_pipeline *pipeline)
 {
        struct radv_shader_variant *gs;
 
@@ -4277,7 +4396,7 @@ static uint32_t offset_to_ps_input(uint32_t offset, bool flat_shade,
 
 static void
 radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs,
-                                struct radv_pipeline *pipeline)
+                                const struct radv_pipeline *pipeline)
 {
        struct radv_shader_variant *ps = pipeline->shaders[MESA_SHADER_FRAGMENT];
        const struct radv_vs_output_info *outinfo = get_vs_output_info(pipeline);
@@ -4454,7 +4573,7 @@ radv_pipeline_generate_fragment_shader(struct radeon_cmdbuf *ctx_cs,
 
 static void
 radv_pipeline_generate_vgt_vertex_reuse(struct radeon_cmdbuf *ctx_cs,
-                                       struct radv_pipeline *pipeline)
+                                       const struct radv_pipeline *pipeline)
 {
        if (pipeline->device->physical_device->rad_info.family < CHIP_POLARIS10 ||
            pipeline->device->physical_device->rad_info.chip_class >= GFX10)
@@ -4469,8 +4588,9 @@ radv_pipeline_generate_vgt_vertex_reuse(struct radeon_cmdbuf *ctx_cs,
                               S_028C58_VTX_REUSE_DEPTH(vtx_reuse_depth));
 }
 
-static uint32_t
-radv_compute_vgt_shader_stages_en(const struct radv_pipeline *pipeline)
+static void
+radv_pipeline_generate_vgt_shader_config(struct radeon_cmdbuf *ctx_cs,
+                                        const struct radv_pipeline *pipeline)
 {
        uint32_t stages = 0;
        if (radv_pipeline_has_tess(pipeline)) {
@@ -4528,51 +4648,53 @@ radv_compute_vgt_shader_stages_en(const struct radv_pipeline *pipeline)
                          S_028B54_VS_W32_EN(vs_size == 32 ? 1 : 0);
        }
 
-       return stages;
+       radeon_set_context_reg(ctx_cs, R_028B54_VGT_SHADER_STAGES_EN, stages);
 }
 
-static uint32_t
-radv_compute_cliprect_rule(const VkGraphicsPipelineCreateInfo *pCreateInfo)
+static void
+radv_pipeline_generate_cliprect_rule(struct radeon_cmdbuf *ctx_cs,
+                                    const VkGraphicsPipelineCreateInfo *pCreateInfo)
 {
        const  VkPipelineDiscardRectangleStateCreateInfoEXT *discard_rectangle_info =
                        vk_find_struct_const(pCreateInfo->pNext, PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT);
+       uint32_t cliprect_rule = 0;
 
-       if (!discard_rectangle_info)
-               return 0xffff;
-
-       unsigned mask = 0;
-
-       for (unsigned i = 0; i < (1u << MAX_DISCARD_RECTANGLES); ++i) {
-               /* Interpret i as a bitmask, and then set the bit in the mask if
-                * that combination of rectangles in which the pixel is contained
-                * should pass the cliprect test. */
-               unsigned relevant_subset = i & ((1u << discard_rectangle_info->discardRectangleCount) - 1);
+       if (!discard_rectangle_info) {
+               cliprect_rule = 0xffff;
+       } else {
+               for (unsigned i = 0; i < (1u << MAX_DISCARD_RECTANGLES); ++i) {
+                       /* Interpret i as a bitmask, and then set the bit in
+                        * the mask if that combination of rectangles in which
+                        * the pixel is contained should pass the cliprect
+                        * test.
+                        */
+                       unsigned relevant_subset = i & ((1u << discard_rectangle_info->discardRectangleCount) - 1);
 
-               if (discard_rectangle_info->discardRectangleMode == VK_DISCARD_RECTANGLE_MODE_INCLUSIVE_EXT &&
-                   !relevant_subset)
-                       continue;
+                       if (discard_rectangle_info->discardRectangleMode == VK_DISCARD_RECTANGLE_MODE_INCLUSIVE_EXT &&
+                           !relevant_subset)
+                               continue;
 
-               if (discard_rectangle_info->discardRectangleMode == VK_DISCARD_RECTANGLE_MODE_EXCLUSIVE_EXT &&
-                   relevant_subset)
-                       continue;
+                       if (discard_rectangle_info->discardRectangleMode == VK_DISCARD_RECTANGLE_MODE_EXCLUSIVE_EXT &&
+                           relevant_subset)
+                               continue;
 
-               mask |= 1u << i;
+                       cliprect_rule |= 1u << i;
+               }
        }
 
-       return mask;
+       radeon_set_context_reg(ctx_cs, R_02820C_PA_SC_CLIPRECT_RULE, cliprect_rule);
 }
 
 static void
 gfx10_pipeline_generate_ge_cntl(struct radeon_cmdbuf *ctx_cs,
-                               struct radv_pipeline *pipeline,
-                               const struct radv_tessellation_state *tess)
+                               struct radv_pipeline *pipeline)
 {
        bool break_wave_at_eoi = false;
        unsigned primgroup_size;
        unsigned vertgroup_size = 256; /* 256 = disable vertex grouping */
 
        if (radv_pipeline_has_tess(pipeline)) {
-               primgroup_size = tess->num_patches; /* must be a multiple of NUM_PATCHES */
+               primgroup_size = pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.num_patches;
        } else if (radv_pipeline_has_gs(pipeline)) {
                const struct gfx9_gs_info *gs_state =
                        &pipeline->shaders[MESA_SHADER_GEOMETRY]->info.gs_ring_info;
@@ -4595,13 +4717,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,
+                                 const 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 prim, unsigned gs_out)
+                           const struct radv_blend_state *blend)
 {
        struct radeon_cmdbuf *ctx_cs = &pipeline->ctx_cs;
        struct radeon_cmdbuf *cs = &pipeline->cs;
@@ -4616,28 +4765,23 @@ 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);
        radv_pipeline_generate_vgt_vertex_reuse(ctx_cs, 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, tess);
-
-       radeon_set_context_reg(ctx_cs, R_028B54_VGT_SHADER_STAGES_EN, radv_compute_vgt_shader_stages_en(pipeline));
-
-       if (pipeline->device->physical_device->rad_info.chip_class >= GFX7) {
-               radeon_set_uconfig_reg_idx(pipeline->device->physical_device,
-                                          cs, R_030908_VGT_PRIMITIVE_TYPE, 1, prim);
-       } else {
-               radeon_set_config_reg(cs, R_008958_VGT_PRIMITIVE_TYPE, prim);
-       }
-       radeon_set_context_reg(ctx_cs, R_028A6C_VGT_GS_OUT_PRIM_TYPE, gs_out);
-
-       radeon_set_context_reg(ctx_cs, R_02820C_PA_SC_CLIPRECT_RULE, radv_compute_cliprect_rule(pCreateInfo));
+               gfx10_pipeline_generate_ge_cntl(ctx_cs, pipeline);
 
        pipeline->ctx_cs_hash = _mesa_hash_data(ctx_cs->buf, ctx_cs->cdw * 4);
 
@@ -4645,107 +4789,12 @@ radv_pipeline_generate_pm4(struct radv_pipeline *pipeline,
        assert(cs->cdw <= cs->max_dw);
 }
 
-static struct radv_ia_multi_vgt_param_helpers
-radv_compute_ia_multi_vgt_param_helpers(struct radv_pipeline *pipeline,
-                                        const struct radv_tessellation_state *tess)
-{
-       struct radv_ia_multi_vgt_param_helpers ia_multi_vgt_param = {0};
-       const struct radv_device *device = pipeline->device;
-
-       if (radv_pipeline_has_tess(pipeline))
-               ia_multi_vgt_param.primgroup_size = tess->num_patches;
-       else if (radv_pipeline_has_gs(pipeline))
-               ia_multi_vgt_param.primgroup_size = 64;
-       else
-               ia_multi_vgt_param.primgroup_size = 128; /* recommended without a GS */
-
-       /* GS requirement. */
-       ia_multi_vgt_param.partial_es_wave = false;
-       if (radv_pipeline_has_gs(pipeline) && device->physical_device->rad_info.chip_class <= GFX8)
-               if (SI_GS_PER_ES / ia_multi_vgt_param.primgroup_size >= pipeline->device->gs_table_depth - 3)
-                       ia_multi_vgt_param.partial_es_wave = true;
-
-       ia_multi_vgt_param.ia_switch_on_eoi = false;
-       if (pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.prim_id_input)
-               ia_multi_vgt_param.ia_switch_on_eoi = true;
-       if (radv_pipeline_has_gs(pipeline) &&
-           pipeline->shaders[MESA_SHADER_GEOMETRY]->info.uses_prim_id)
-               ia_multi_vgt_param.ia_switch_on_eoi = true;
-       if (radv_pipeline_has_tess(pipeline)) {
-               /* SWITCH_ON_EOI must be set if PrimID is used. */
-               if (pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.uses_prim_id ||
-                   radv_get_shader(pipeline, MESA_SHADER_TESS_EVAL)->info.uses_prim_id)
-                       ia_multi_vgt_param.ia_switch_on_eoi = true;
-       }
-
-       ia_multi_vgt_param.partial_vs_wave = false;
-       if (radv_pipeline_has_tess(pipeline)) {
-               /* Bug with tessellation and GS on Bonaire and older 2 SE chips. */
-               if ((device->physical_device->rad_info.family == CHIP_TAHITI ||
-                    device->physical_device->rad_info.family == CHIP_PITCAIRN ||
-                    device->physical_device->rad_info.family == CHIP_BONAIRE) &&
-                   radv_pipeline_has_gs(pipeline))
-                       ia_multi_vgt_param.partial_vs_wave = true;
-               /* Needed for 028B6C_DISTRIBUTION_MODE != 0 */
-               if (device->physical_device->rad_info.has_distributed_tess) {
-                       if (radv_pipeline_has_gs(pipeline)) {
-                               if (device->physical_device->rad_info.chip_class <= GFX8)
-                                       ia_multi_vgt_param.partial_es_wave = true;
-                       } else {
-                               ia_multi_vgt_param.partial_vs_wave = true;
-                       }
-               }
-       }
-
-       if (radv_pipeline_has_gs(pipeline)) {
-               /* On these chips there is the possibility of a hang if the
-                * pipeline uses a GS and partial_vs_wave is not set.
-                *
-                * This mostly does not hit 4-SE chips, as those typically set
-                * ia_switch_on_eoi and then partial_vs_wave is set for pipelines
-                * with GS due to another workaround.
-                *
-                * Reproducer: https://bugs.freedesktop.org/show_bug.cgi?id=109242
-                */
-               if (device->physical_device->rad_info.family == CHIP_TONGA ||
-                   device->physical_device->rad_info.family == CHIP_FIJI ||
-                   device->physical_device->rad_info.family == CHIP_POLARIS10 ||
-                   device->physical_device->rad_info.family == CHIP_POLARIS11 ||
-                   device->physical_device->rad_info.family == CHIP_POLARIS12 ||
-                   device->physical_device->rad_info.family == CHIP_VEGAM) {
-                       ia_multi_vgt_param.partial_vs_wave = true;
-               }
-       }
-
-       ia_multi_vgt_param.base =
-               S_028AA8_PRIMGROUP_SIZE(ia_multi_vgt_param.primgroup_size - 1) |
-               /* The following field was moved to VGT_SHADER_STAGES_EN in GFX9. */
-               S_028AA8_MAX_PRIMGRP_IN_WAVE(device->physical_device->rad_info.chip_class == GFX8 ? 2 : 0) |
-               S_030960_EN_INST_OPT_BASIC(device->physical_device->rad_info.chip_class >= GFX9) |
-               S_030960_EN_INST_OPT_ADV(device->physical_device->rad_info.chip_class >= GFX9);
-
-       return ia_multi_vgt_param;
-}
-
-
 static void
-radv_compute_vertex_input_state(struct radv_pipeline *pipeline,
-                                const VkGraphicsPipelineCreateInfo *pCreateInfo)
+radv_pipeline_init_vertex_input_state(struct radv_pipeline *pipeline,
+                                     const VkGraphicsPipelineCreateInfo *pCreateInfo)
 {
        const VkPipelineVertexInputStateCreateInfo *vi_info =
                pCreateInfo->pVertexInputState;
-       struct radv_vertex_elements_info *velems = &pipeline->vertex_elements;
-
-       for (uint32_t i = 0; i < vi_info->vertexAttributeDescriptionCount; i++) {
-               const VkVertexInputAttributeDescription *desc =
-                       &vi_info->pVertexAttributeDescriptions[i];
-               unsigned loc = desc->location;
-               const struct vk_format_description *format_desc;
-
-               format_desc = vk_format_description(desc->format);
-
-               velems->format_size[loc] = format_desc->block.bits / 8;
-       }
 
        for (uint32_t i = 0; i < vi_info->vertexBindingDescriptionCount; i++) {
                const VkVertexInputBindingDescription *desc =
@@ -4773,195 +4822,31 @@ radv_pipeline_get_streamout_shader(struct radv_pipeline *pipeline)
        return NULL;
 }
 
-static VkResult
-radv_secure_compile(struct radv_pipeline *pipeline,
-                   struct radv_device *device,
-                   const struct radv_pipeline_key *key,
-                   const VkPipelineShaderStageCreateInfo **pStages,
-                   const VkPipelineCreateFlags flags,
-                   unsigned num_stages)
+static void
+radv_pipeline_init_shader_stages_state(struct radv_pipeline *pipeline)
 {
-       uint8_t allowed_pipeline_hashes[2][20];
-       radv_hash_shaders(allowed_pipeline_hashes[0], pStages,
-                         pipeline->layout, key, get_hash_flags(device));
-
-       /* Generate the GC copy hash */
-       memcpy(allowed_pipeline_hashes[1], allowed_pipeline_hashes[0], 20);
-       allowed_pipeline_hashes[1][0] ^= 1;
-
-       uint8_t allowed_hashes[2][20];
-       for (unsigned i = 0; i < 2; ++i) {
-               disk_cache_compute_key(device->physical_device->disk_cache,
-                                      allowed_pipeline_hashes[i], 20,
-                                      allowed_hashes[i]);
-       }
-
-       /* Do an early exit if all cache entries are already there. */
-       bool may_need_copy_shader = pStages[MESA_SHADER_GEOMETRY];
-       void *main_entry = disk_cache_get(device->physical_device->disk_cache, allowed_hashes[0], NULL);
-       void *copy_entry = NULL;
-       if (may_need_copy_shader)
-               copy_entry = disk_cache_get(device->physical_device->disk_cache, allowed_hashes[1], NULL);
-
-       bool has_all_cache_entries = main_entry && (!may_need_copy_shader || copy_entry);
-       free(main_entry);
-       free(copy_entry);
-
-       if(has_all_cache_entries)
-               return VK_SUCCESS;
-
-       unsigned process = 0;
-       uint8_t sc_threads = device->instance->num_sc_threads;
-       while (true) {
-               mtx_lock(&device->sc_state->secure_compile_mutex);
-               if (device->sc_state->secure_compile_thread_counter < sc_threads) {
-                       device->sc_state->secure_compile_thread_counter++;
-                       for (unsigned i = 0; i < sc_threads; i++) {
-                               if (!device->sc_state->secure_compile_processes[i].in_use) {
-                                       device->sc_state->secure_compile_processes[i].in_use = true;
-                                       process = i;
-                                       break;
-                               }
-                       }
-                       mtx_unlock(&device->sc_state->secure_compile_mutex);
-                       break;
-               }
-               mtx_unlock(&device->sc_state->secure_compile_mutex);
-       }
-
-       int fd_secure_input = device->sc_state->secure_compile_processes[process].fd_secure_input;
-       int fd_secure_output = device->sc_state->secure_compile_processes[process].fd_secure_output;
-
-       /* Fork a copy of the slim untainted secure compile process */
-       enum radv_secure_compile_type sc_type = RADV_SC_TYPE_FORK_DEVICE;
-       write(fd_secure_input, &sc_type, sizeof(sc_type));
-
-       if (!radv_sc_read(fd_secure_output, &sc_type, sizeof(sc_type), true) ||
-           sc_type != RADV_SC_TYPE_INIT_SUCCESS)
-               return VK_ERROR_DEVICE_LOST;
-
-       fd_secure_input = device->sc_state->secure_compile_processes[process].fd_server;
-       fd_secure_output = device->sc_state->secure_compile_processes[process].fd_client;
-
-       /* Write pipeline / shader module out to secure process via pipe */
-       sc_type = RADV_SC_TYPE_COMPILE_PIPELINE;
-       write(fd_secure_input, &sc_type, sizeof(sc_type));
-
-       /* Write pipeline layout out to secure process */
-       struct radv_pipeline_layout *layout = pipeline->layout;
-       write(fd_secure_input, layout, sizeof(struct radv_pipeline_layout));
-       write(fd_secure_input, &layout->num_sets, sizeof(uint32_t));
-       for (uint32_t set = 0; set < layout->num_sets; set++) {
-               write(fd_secure_input, &layout->set[set].layout->layout_size, sizeof(uint32_t));
-               write(fd_secure_input, layout->set[set].layout, layout->set[set].layout->layout_size);
-       }
-
-       /* Write pipeline key out to secure process */
-       write(fd_secure_input, key, sizeof(struct radv_pipeline_key));
-
-       /* Write pipeline create flags out to secure process */
-       write(fd_secure_input, &flags, sizeof(VkPipelineCreateFlags));
+       struct radv_device *device = pipeline->device;
 
-       /* Write stage and shader information out to secure process */
-       write(fd_secure_input, &num_stages, sizeof(uint32_t));
-       for (uint32_t i = 0; i < MESA_SHADER_STAGES; i++) {
-               if (!pStages[i])
-                       continue;
+       for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
+               pipeline->user_data_0[i] =
+                       radv_pipeline_stage_to_user_data_0(pipeline, i,
+                                                          device->physical_device->rad_info.chip_class);
 
-               /* Write stage out to secure process */
-               gl_shader_stage stage = ffs(pStages[i]->stage) - 1;
-               write(fd_secure_input, &stage, sizeof(gl_shader_stage));
-
-               /* Write entry point name out to secure process */
-               size_t name_size = strlen(pStages[i]->pName) + 1;
-               write(fd_secure_input, &name_size, sizeof(size_t));
-               write(fd_secure_input, pStages[i]->pName, name_size);
-
-               /* Write shader module out to secure process */
-               struct radv_shader_module *module = radv_shader_module_from_handle(pStages[i]->module);
-               assert(!module->nir);
-               size_t module_size = sizeof(struct radv_shader_module) + module->size;
-               write(fd_secure_input, &module_size, sizeof(size_t));
-               write(fd_secure_input, module, module_size);
-
-               /* Write specialization info out to secure process */
-               const VkSpecializationInfo *specInfo = pStages[i]->pSpecializationInfo;
-               bool has_spec_info = specInfo ? true : false;
-               write(fd_secure_input, &has_spec_info, sizeof(bool));
-               if (specInfo) {
-                       write(fd_secure_input, &specInfo->dataSize, sizeof(size_t));
-                       write(fd_secure_input, specInfo->pData, specInfo->dataSize);
-
-                       write(fd_secure_input, &specInfo->mapEntryCount, sizeof(uint32_t));
-                       for (uint32_t j = 0; j < specInfo->mapEntryCount; j++)
-                               write(fd_secure_input, &specInfo->pMapEntries[j], sizeof(VkSpecializationMapEntry));
+               if (pipeline->shaders[i]) {
+                       pipeline->need_indirect_descriptor_sets |= pipeline->shaders[i]->info.need_indirect_descriptor_sets;
                }
        }
 
-       /* Read the data returned from the secure process */
-       while (sc_type != RADV_SC_TYPE_COMPILE_PIPELINE_FINISHED) {
-               if (!radv_sc_read(fd_secure_output, &sc_type, sizeof(sc_type), true))
-                       return VK_ERROR_DEVICE_LOST;
-
-               if (sc_type == RADV_SC_TYPE_WRITE_DISK_CACHE) {
-                       assert(device->physical_device->disk_cache);
-
-                       uint8_t disk_sha1[20];
-                       if (!radv_sc_read(fd_secure_output, disk_sha1, sizeof(uint8_t) * 20, true))
-                               return VK_ERROR_DEVICE_LOST;
-
-                       if (memcmp(disk_sha1, allowed_hashes[0], 20) &&
-                           memcmp(disk_sha1, allowed_hashes[1], 20))
-                               return VK_ERROR_DEVICE_LOST;
-
-                       uint32_t entry_size;
-                       if (!radv_sc_read(fd_secure_output, &entry_size, sizeof(uint32_t), true))
-                               return VK_ERROR_DEVICE_LOST;
-
-                       struct cache_entry *entry = malloc(entry_size);
-                       if (!radv_sc_read(fd_secure_output, entry, entry_size, true))
-                               return VK_ERROR_DEVICE_LOST;
-
-                       disk_cache_put(device->physical_device->disk_cache,
-                                      disk_sha1, entry, entry_size,
-                                      NULL);
-
-                       free(entry);
-               } else if (sc_type == RADV_SC_TYPE_READ_DISK_CACHE) {
-                       uint8_t disk_sha1[20];
-                       if (!radv_sc_read(fd_secure_output, disk_sha1, sizeof(uint8_t) * 20, true))
-                               return VK_ERROR_DEVICE_LOST;
-
-                       if (memcmp(disk_sha1, allowed_hashes[0], 20) &&
-                           memcmp(disk_sha1, allowed_hashes[1], 20))
-                               return VK_ERROR_DEVICE_LOST;
-
-                       size_t size;
-                       struct cache_entry *entry = (struct cache_entry *)
-                               disk_cache_get(device->physical_device->disk_cache,
-                                              disk_sha1, &size);
-
-                       uint8_t found = entry ? 1 : 0;
-                       write(fd_secure_input, &found, sizeof(uint8_t));
-
-                       if (found) {
-                               write(fd_secure_input, &size, sizeof(size_t));
-                               write(fd_secure_input, entry, size);
-                       }
-
-                       free(entry);
-               }
+       struct radv_userdata_info *loc = radv_lookup_user_sgpr(pipeline, MESA_SHADER_VERTEX,
+                                                            AC_UD_VS_BASE_VERTEX_START_INSTANCE);
+       if (loc->sgpr_idx != -1) {
+               pipeline->graphics.vtx_base_sgpr = pipeline->user_data_0[MESA_SHADER_VERTEX];
+               pipeline->graphics.vtx_base_sgpr += loc->sgpr_idx * 4;
+               if (radv_get_shader(pipeline, MESA_SHADER_VERTEX)->info.vs.needs_draw_id)
+                       pipeline->graphics.vtx_emit_num = 3;
+               else
+                       pipeline->graphics.vtx_emit_num = 2;
        }
-
-       sc_type = RADV_SC_TYPE_DESTROY_DEVICE;
-       write(fd_secure_input, &sc_type, sizeof(sc_type));
-
-       mtx_lock(&device->sc_state->secure_compile_mutex);
-       device->sc_state->secure_compile_thread_counter--;
-       device->sc_state->secure_compile_processes[process].in_use = false;
-       mtx_unlock(&device->sc_state->secure_compile_mutex);
-
-       return VK_SUCCESS;
 }
 
 static VkResult
@@ -4972,12 +4857,6 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
                   const struct radv_graphics_pipeline_create_info *extra)
 {
        VkResult result;
-       bool has_view_index = false;
-
-       RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
-       struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
-       if (subpass->view_mask)
-               has_view_index = true;
 
        pipeline->device = device;
        pipeline->layout = radv_pipeline_layout_from_handle(pCreateInfo->layout);
@@ -5000,47 +4879,20 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
                        stage_feedbacks[stage] = &creation_feedback->pPipelineStageCreationFeedbacks[i];
        }
 
-       struct radv_pipeline_key key = radv_generate_graphics_pipeline_key(pipeline, pCreateInfo, &blend, has_view_index);
-       if (radv_device_use_secure_compile(device->instance)) {
-               return radv_secure_compile(pipeline, device, &key, pStages, pCreateInfo->flags, pCreateInfo->stageCount);
-       } else {
-               result = radv_create_shaders(pipeline, device, cache, &key, pStages,
-                                            pCreateInfo->flags, pipeline_feedback,
-                                            stage_feedbacks);
-               if (result != VK_SUCCESS)
-                       return result;
-       }
+       struct radv_pipeline_key key = radv_generate_graphics_pipeline_key(pipeline, pCreateInfo, &blend);
+
+       result = radv_create_shaders(pipeline, device, cache, &key, pStages,
+                                    pCreateInfo->flags, pipeline_feedback,
+                                    stage_feedbacks);
+       if (result != VK_SUCCESS)
+               return result;
 
        pipeline->graphics.spi_baryc_cntl = S_0286E0_FRONT_FACE_ALL_BITS(1);
        radv_pipeline_init_multisample_state(pipeline, &blend, pCreateInfo);
-       uint32_t gs_out;
-       uint32_t prim = si_translate_prim(pCreateInfo->pInputAssemblyState->topology);
-
-       pipeline->graphics.topology = si_translate_prim(pCreateInfo->pInputAssemblyState->topology);
-       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) {
-               prim = V_008958_DI_PT_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_dynamic_state(pipeline, pCreateInfo);
+       radv_pipeline_init_input_assembly_state(pipeline, pCreateInfo, extra);
+       radv_pipeline_init_dynamic_state(pipeline, pCreateInfo, extra);
+       radv_pipeline_init_raster_state(pipeline, pCreateInfo);
+       radv_pipeline_init_depth_stencil_state(pipeline, pCreateInfo);
 
        /* Ensure that some export memory is always allocated, for two reasons:
         *
@@ -5080,49 +4932,30 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
                blend.cb_shader_mask = 0xf;
        }
 
-       for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
-               if (pipeline->shaders[i]) {
-                       pipeline->need_indirect_descriptor_sets |= pipeline->shaders[i]->info.need_indirect_descriptor_sets;
-               }
-       }
+       pipeline->graphics.col_format = blend.spi_shader_col_format;
+       pipeline->graphics.cb_target_mask = blend.cb_target_mask;
 
        if (radv_pipeline_has_gs(pipeline) && !radv_pipeline_has_ngg(pipeline)) {
                struct radv_shader_variant *gs =
                        pipeline->shaders[MESA_SHADER_GEOMETRY];
 
-               calculate_gs_ring_sizes(pipeline, &gs->info.gs_ring_info);
+               radv_pipeline_init_gs_ring_state(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, &tess);
-
-       radv_compute_vertex_input_state(pipeline, pCreateInfo);
-
-       for (uint32_t i = 0; i < MESA_SHADER_STAGES; i++)
-               pipeline->user_data_0[i] = radv_pipeline_stage_to_user_data_0(pipeline, i, device->physical_device->rad_info.chip_class);
-
-       struct radv_userdata_info *loc = radv_lookup_user_sgpr(pipeline, MESA_SHADER_VERTEX,
-                                                            AC_UD_VS_BASE_VERTEX_START_INSTANCE);
-       if (loc->sgpr_idx != -1) {
-               pipeline->graphics.vtx_base_sgpr = pipeline->user_data_0[MESA_SHADER_VERTEX];
-               pipeline->graphics.vtx_base_sgpr += loc->sgpr_idx * 4;
-               if (radv_get_shader(pipeline, MESA_SHADER_VERTEX)->info.vs.needs_draw_id)
-                       pipeline->graphics.vtx_emit_num = 3;
-               else
-                       pipeline->graphics.vtx_emit_num = 2;
-       }
+       radv_pipeline_init_vertex_input_state(pipeline, pCreateInfo);
+       radv_pipeline_init_binning_state(pipeline, pCreateInfo, &blend);
+       radv_pipeline_init_shader_stages_state(pipeline);
+       radv_pipeline_init_scratch(device, pipeline);
 
        /* Find the last vertex shader stage that eventually uses streamout. */
        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, prim, gs_out);
+       radv_pipeline_generate_pm4(pipeline, pCreateInfo, extra, &blend);
 
        return result;
 }
@@ -5193,59 +5026,71 @@ VkResult radv_CreateGraphicsPipelines(
        return result;
 }
 
+static void
+radv_pipeline_generate_hw_cs(struct radeon_cmdbuf *cs,
+                            const struct radv_pipeline *pipeline)
+{
+       struct radv_shader_variant *shader = pipeline->shaders[MESA_SHADER_COMPUTE];
+       uint64_t va = radv_buffer_get_va(shader->bo) + shader->bo_offset;
+       struct radv_device *device = pipeline->device;
+
+       radeon_set_sh_reg_seq(cs, R_00B830_COMPUTE_PGM_LO, 2);
+       radeon_emit(cs, va >> 8);
+       radeon_emit(cs, S_00B834_DATA(va >> 40));
+
+       radeon_set_sh_reg_seq(cs, R_00B848_COMPUTE_PGM_RSRC1, 2);
+       radeon_emit(cs, shader->config.rsrc1);
+       radeon_emit(cs, shader->config.rsrc2);
+       if (device->physical_device->rad_info.chip_class >= GFX10) {
+               radeon_set_sh_reg(cs, R_00B8A0_COMPUTE_PGM_RSRC3, shader->config.rsrc3);
+       }
+}
 
 static void
-radv_compute_generate_pm4(struct radv_pipeline *pipeline)
+radv_pipeline_generate_compute_state(struct radeon_cmdbuf *cs,
+                                    const struct radv_pipeline *pipeline)
 {
-       struct radv_shader_variant *compute_shader;
+       struct radv_shader_variant *shader = pipeline->shaders[MESA_SHADER_COMPUTE];
        struct radv_device *device = pipeline->device;
        unsigned threads_per_threadgroup;
        unsigned threadgroups_per_cu = 1;
        unsigned waves_per_threadgroup;
        unsigned max_waves_per_sh = 0;
-       uint64_t va;
-
-       pipeline->cs.max_dw = device->physical_device->rad_info.chip_class >= GFX10 ? 22 : 20;
-       pipeline->cs.buf = malloc(pipeline->cs.max_dw * 4);
-
-       compute_shader = pipeline->shaders[MESA_SHADER_COMPUTE];
-       va = radv_buffer_get_va(compute_shader->bo) + compute_shader->bo_offset;
-
-       radeon_set_sh_reg_seq(&pipeline->cs, R_00B830_COMPUTE_PGM_LO, 2);
-       radeon_emit(&pipeline->cs, va >> 8);
-       radeon_emit(&pipeline->cs, S_00B834_DATA(va >> 40));
-
-       radeon_set_sh_reg_seq(&pipeline->cs, R_00B848_COMPUTE_PGM_RSRC1, 2);
-       radeon_emit(&pipeline->cs, compute_shader->config.rsrc1);
-       radeon_emit(&pipeline->cs, compute_shader->config.rsrc2);
-       if (device->physical_device->rad_info.chip_class >= GFX10) {
-               radeon_set_sh_reg(&pipeline->cs, R_00B8A0_COMPUTE_PGM_RSRC3, compute_shader->config.rsrc3);
-       }
 
        /* Calculate best compute resource limits. */
-       threads_per_threadgroup = compute_shader->info.cs.block_size[0] *
-                                 compute_shader->info.cs.block_size[1] *
-                                 compute_shader->info.cs.block_size[2];
+       threads_per_threadgroup = shader->info.cs.block_size[0] *
+                                 shader->info.cs.block_size[1] *
+                                 shader->info.cs.block_size[2];
        waves_per_threadgroup = DIV_ROUND_UP(threads_per_threadgroup,
-                                            compute_shader->info.wave_size);
+                                            shader->info.wave_size);
 
        if (device->physical_device->rad_info.chip_class >= GFX10 &&
            waves_per_threadgroup == 1)
                threadgroups_per_cu = 2;
 
-       radeon_set_sh_reg(&pipeline->cs, R_00B854_COMPUTE_RESOURCE_LIMITS,
+       radeon_set_sh_reg(cs, R_00B854_COMPUTE_RESOURCE_LIMITS,
                          ac_get_compute_resource_limits(&device->physical_device->rad_info,
                                                         waves_per_threadgroup,
                                                         max_waves_per_sh,
                                                         threadgroups_per_cu));
 
-       radeon_set_sh_reg_seq(&pipeline->cs, R_00B81C_COMPUTE_NUM_THREAD_X, 3);
-       radeon_emit(&pipeline->cs,
-                   S_00B81C_NUM_THREAD_FULL(compute_shader->info.cs.block_size[0]));
-       radeon_emit(&pipeline->cs,
-                   S_00B81C_NUM_THREAD_FULL(compute_shader->info.cs.block_size[1]));
-       radeon_emit(&pipeline->cs,
-                   S_00B81C_NUM_THREAD_FULL(compute_shader->info.cs.block_size[2]));
+       radeon_set_sh_reg_seq(cs, R_00B81C_COMPUTE_NUM_THREAD_X, 3);
+       radeon_emit(cs, S_00B81C_NUM_THREAD_FULL(shader->info.cs.block_size[0]));
+       radeon_emit(cs, S_00B81C_NUM_THREAD_FULL(shader->info.cs.block_size[1]));
+       radeon_emit(cs, S_00B81C_NUM_THREAD_FULL(shader->info.cs.block_size[2]));
+}
+
+static void
+radv_compute_generate_pm4(struct radv_pipeline *pipeline)
+{
+       struct radv_device *device = pipeline->device;
+       struct radeon_cmdbuf *cs = &pipeline->cs;
+
+       cs->max_dw = device->physical_device->rad_info.chip_class >= GFX10 ? 19 : 16;
+       cs->buf = malloc(cs->max_dw * 4);
+
+       radv_pipeline_generate_hw_cs(cs, pipeline);
+       radv_pipeline_generate_compute_state(cs, pipeline);
 
        assert(pipeline->cs.cdw <= pipeline->cs.max_dw);
 }
@@ -5313,28 +5158,17 @@ static VkResult radv_compute_pipeline_create(
        struct radv_pipeline_key key =
                radv_generate_compute_pipeline_key(pipeline, pCreateInfo);
 
-       if (radv_device_use_secure_compile(device->instance)) {
-               result = radv_secure_compile(pipeline, device, &key, pStages, pCreateInfo->flags, 1);
-               *pPipeline = radv_pipeline_to_handle(pipeline);
-
+       result = radv_create_shaders(pipeline, device, cache, &key, pStages,
+                                    pCreateInfo->flags, pipeline_feedback,
+                                    stage_feedbacks);
+       if (result != VK_SUCCESS) {
+               radv_pipeline_destroy(device, pipeline, pAllocator);
                return result;
-       } else {
-               result = radv_create_shaders(pipeline, device, cache, &key, pStages,
-                                            pCreateInfo->flags, pipeline_feedback,
-                                            stage_feedbacks);
-               if (result != VK_SUCCESS) {
-                       radv_pipeline_destroy(device, pipeline, pAllocator);
-                       return result;
-               }
        }
 
        pipeline->user_data_0[MESA_SHADER_COMPUTE] = radv_pipeline_stage_to_user_data_0(pipeline, MESA_SHADER_COMPUTE, device->physical_device->rad_info.chip_class);
        pipeline->need_indirect_descriptor_sets |= pipeline->shaders[MESA_SHADER_COMPUTE]->info.need_indirect_descriptor_sets;
-       result = radv_pipeline_scratch_init(device, pipeline);
-       if (result != VK_SUCCESS) {
-               radv_pipeline_destroy(device, pipeline, pAllocator);
-               return result;
-       }
+       radv_pipeline_init_scratch(device, pipeline);
 
        radv_compute_generate_pm4(pipeline);
 
@@ -5680,7 +5514,7 @@ VkResult radv_GetPipelineExecutableInternalRepresentationsKHR(
        /* backend IR */
        if (p < end) {
                p->isText = true;
-               if (pipeline->device->physical_device->use_llvm) {
+               if (radv_use_llvm_for_stage(pipeline->device, stage)) {
                        desc_copy(p->name, "LLVM IR");
                        desc_copy(p->description, "The LLVM IR after some optimizations");
                } else {