radv: implement VK_AMD_shader_explicit_vertex_parameter
[mesa.git] / src / amd / vulkan / radv_pipeline.c
index 95b1684fdf827da35a185464718299471592db05..26e45e2a76e02e2e18e6d52e9c5a450d895bbb7e 100644 (file)
@@ -91,6 +91,50 @@ struct radv_tessellation_state {
        uint32_t tf_param;
 };
 
+static const VkPipelineMultisampleStateCreateInfo *
+radv_pipeline_get_multisample_state(const VkGraphicsPipelineCreateInfo *pCreateInfo)
+{
+       if (!pCreateInfo->pRasterizationState->rasterizerDiscardEnable)
+               return pCreateInfo->pMultisampleState;
+       return NULL;
+}
+
+static const VkPipelineTessellationStateCreateInfo *
+radv_pipeline_get_tessellation_state(const VkGraphicsPipelineCreateInfo *pCreateInfo)
+{
+       for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) {
+               if (pCreateInfo->pStages[i].stage == VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT ||
+                   pCreateInfo->pStages[i].stage == VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT) {
+                       return pCreateInfo->pTessellationState;
+               }
+       }
+       return NULL;
+}
+
+static const VkPipelineDepthStencilStateCreateInfo *
+radv_pipeline_get_depth_stencil_state(const VkGraphicsPipelineCreateInfo *pCreateInfo)
+{
+       RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
+       struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
+
+       if (!pCreateInfo->pRasterizationState->rasterizerDiscardEnable &&
+           subpass->depth_stencil_attachment)
+               return pCreateInfo->pDepthStencilState;
+       return NULL;
+}
+
+static const VkPipelineColorBlendStateCreateInfo *
+radv_pipeline_get_color_blend_state(const VkGraphicsPipelineCreateInfo *pCreateInfo)
+{
+       RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
+       struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
+
+       if (!pCreateInfo->pRasterizationState->rasterizerDiscardEnable &&
+           subpass->has_color_att)
+               return pCreateInfo->pColorBlendState;
+       return NULL;
+}
+
 bool radv_pipeline_has_ngg(const struct radv_pipeline *pipeline)
 {
        struct radv_shader_variant *variant = NULL;
@@ -105,6 +149,22 @@ bool radv_pipeline_has_ngg(const struct radv_pipeline *pipeline)
        return variant->info.is_ngg;
 }
 
+bool radv_pipeline_has_ngg_passthrough(const struct radv_pipeline *pipeline)
+{
+       assert(radv_pipeline_has_ngg(pipeline));
+
+       struct radv_shader_variant *variant = NULL;
+       if (pipeline->shaders[MESA_SHADER_GEOMETRY])
+               variant = pipeline->shaders[MESA_SHADER_GEOMETRY];
+       else if (pipeline->shaders[MESA_SHADER_TESS_EVAL])
+               variant = pipeline->shaders[MESA_SHADER_TESS_EVAL];
+       else if (pipeline->shaders[MESA_SHADER_VERTEX])
+               variant = pipeline->shaders[MESA_SHADER_VERTEX];
+       else
+               return false;
+       return variant->info.is_ngg_passthrough;
+}
+
 bool radv_pipeline_has_gs_copy_shader(const struct radv_pipeline *pipeline)
 {
        if (!radv_pipeline_has_gs(pipeline))
@@ -698,24 +758,24 @@ radv_pipeline_init_blend_state(struct radv_pipeline *pipeline,
                               const VkGraphicsPipelineCreateInfo *pCreateInfo,
                               const struct radv_graphics_pipeline_create_info *extra)
 {
-       const VkPipelineColorBlendStateCreateInfo *vkblend = pCreateInfo->pColorBlendState;
-       const VkPipelineMultisampleStateCreateInfo *vkms = pCreateInfo->pMultisampleState;
+       const VkPipelineColorBlendStateCreateInfo *vkblend = radv_pipeline_get_color_blend_state(pCreateInfo);
+       const VkPipelineMultisampleStateCreateInfo *vkms = radv_pipeline_get_multisample_state(pCreateInfo);
        struct radv_blend_state blend = {0};
        unsigned mode = V_028808_CB_NORMAL;
        int i;
 
-       if (!vkblend)
-               return blend;
-
        if (extra && extra->custom_blend_mode) {
                blend.single_cb_enable = true;
                mode = extra->custom_blend_mode;
        }
+
        blend.cb_color_control = 0;
-       if (vkblend->logicOpEnable)
-               blend.cb_color_control |= S_028808_ROP3(si_translate_blend_logic_op(vkblend->logicOp));
-       else
-               blend.cb_color_control |= S_028808_ROP3(V_028808_ROP3_COPY);
+       if (vkblend) {
+               if (vkblend->logicOpEnable)
+                       blend.cb_color_control |= S_028808_ROP3(si_translate_blend_logic_op(vkblend->logicOp));
+               else
+                       blend.cb_color_control |= S_028808_ROP3(V_028808_ROP3_COPY);
+       }
 
        blend.db_alpha_to_mask = S_028B70_ALPHA_TO_MASK_OFFSET0(3) |
                S_028B70_ALPHA_TO_MASK_OFFSET1(1) |
@@ -729,117 +789,119 @@ radv_pipeline_init_blend_state(struct radv_pipeline *pipeline,
        }
 
        blend.cb_target_mask = 0;
-       for (i = 0; i < vkblend->attachmentCount; i++) {
-               const VkPipelineColorBlendAttachmentState *att = &vkblend->pAttachments[i];
-               unsigned blend_cntl = 0;
-               unsigned srcRGB_opt, dstRGB_opt, srcA_opt, dstA_opt;
-               VkBlendOp eqRGB = att->colorBlendOp;
-               VkBlendFactor srcRGB = att->srcColorBlendFactor;
-               VkBlendFactor dstRGB = att->dstColorBlendFactor;
-               VkBlendOp eqA = att->alphaBlendOp;
-               VkBlendFactor srcA = att->srcAlphaBlendFactor;
-               VkBlendFactor dstA = att->dstAlphaBlendFactor;
-
-               blend.sx_mrt_blend_opt[i] = S_028760_COLOR_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED) | S_028760_ALPHA_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED);
-
-               if (!att->colorWriteMask)
-                       continue;
+       if (vkblend) {
+               for (i = 0; i < vkblend->attachmentCount; i++) {
+                       const VkPipelineColorBlendAttachmentState *att = &vkblend->pAttachments[i];
+                       unsigned blend_cntl = 0;
+                       unsigned srcRGB_opt, dstRGB_opt, srcA_opt, dstA_opt;
+                       VkBlendOp eqRGB = att->colorBlendOp;
+                       VkBlendFactor srcRGB = att->srcColorBlendFactor;
+                       VkBlendFactor dstRGB = att->dstColorBlendFactor;
+                       VkBlendOp eqA = att->alphaBlendOp;
+                       VkBlendFactor srcA = att->srcAlphaBlendFactor;
+                       VkBlendFactor dstA = att->dstAlphaBlendFactor;
+
+                       blend.sx_mrt_blend_opt[i] = S_028760_COLOR_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED) | S_028760_ALPHA_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED);
+
+                       if (!att->colorWriteMask)
+                               continue;
 
-               blend.cb_target_mask |= (unsigned)att->colorWriteMask << (4 * i);
-               blend.cb_target_enabled_4bit |= 0xf << (4 * i);
-               if (!att->blendEnable) {
-                       blend.cb_blend_control[i] = blend_cntl;
-                       continue;
-               }
+                       blend.cb_target_mask |= (unsigned)att->colorWriteMask << (4 * i);
+                       blend.cb_target_enabled_4bit |= 0xf << (4 * i);
+                       if (!att->blendEnable) {
+                               blend.cb_blend_control[i] = blend_cntl;
+                               continue;
+                       }
 
-               if (is_dual_src(srcRGB) || is_dual_src(dstRGB) || is_dual_src(srcA) || is_dual_src(dstA))
-                       if (i == 0)
-                               blend.mrt0_is_dual_src = true;
+                       if (is_dual_src(srcRGB) || is_dual_src(dstRGB) || is_dual_src(srcA) || is_dual_src(dstA))
+                               if (i == 0)
+                                       blend.mrt0_is_dual_src = true;
 
-               if (eqRGB == VK_BLEND_OP_MIN || eqRGB == VK_BLEND_OP_MAX) {
-                       srcRGB = VK_BLEND_FACTOR_ONE;
-                       dstRGB = VK_BLEND_FACTOR_ONE;
-               }
-               if (eqA == VK_BLEND_OP_MIN || eqA == VK_BLEND_OP_MAX) {
-                       srcA = VK_BLEND_FACTOR_ONE;
-                       dstA = VK_BLEND_FACTOR_ONE;
-               }
+                       if (eqRGB == VK_BLEND_OP_MIN || eqRGB == VK_BLEND_OP_MAX) {
+                               srcRGB = VK_BLEND_FACTOR_ONE;
+                               dstRGB = VK_BLEND_FACTOR_ONE;
+                       }
+                       if (eqA == VK_BLEND_OP_MIN || eqA == VK_BLEND_OP_MAX) {
+                               srcA = VK_BLEND_FACTOR_ONE;
+                               dstA = VK_BLEND_FACTOR_ONE;
+                       }
 
-               radv_blend_check_commutativity(&blend, eqRGB, srcRGB, dstRGB,
-                                              0x7 << (4 * i));
-               radv_blend_check_commutativity(&blend, eqA, srcA, dstA,
-                                              0x8 << (4 * i));
+                       radv_blend_check_commutativity(&blend, eqRGB, srcRGB, dstRGB,
+                                                      0x7 << (4 * i));
+                       radv_blend_check_commutativity(&blend, eqA, srcA, dstA,
+                                                      0x8 << (4 * i));
 
-               /* Blending optimizations for RB+.
-                * These transformations don't change the behavior.
-                *
-                * First, get rid of DST in the blend factors:
-                *    func(src * DST, dst * 0) ---> func(src * 0, dst * SRC)
-                */
-               si_blend_remove_dst(&eqRGB, &srcRGB, &dstRGB,
-                                   VK_BLEND_FACTOR_DST_COLOR,
-                                   VK_BLEND_FACTOR_SRC_COLOR);
-
-               si_blend_remove_dst(&eqA, &srcA, &dstA,
-                                   VK_BLEND_FACTOR_DST_COLOR,
-                                   VK_BLEND_FACTOR_SRC_COLOR);
-
-               si_blend_remove_dst(&eqA, &srcA, &dstA,
-                                   VK_BLEND_FACTOR_DST_ALPHA,
-                                   VK_BLEND_FACTOR_SRC_ALPHA);
-
-               /* Look up the ideal settings from tables. */
-               srcRGB_opt = si_translate_blend_opt_factor(srcRGB, false);
-               dstRGB_opt = si_translate_blend_opt_factor(dstRGB, false);
-               srcA_opt = si_translate_blend_opt_factor(srcA, true);
-               dstA_opt = si_translate_blend_opt_factor(dstA, true);
-
-                               /* Handle interdependencies. */
-               if (si_blend_factor_uses_dst(srcRGB))
-                       dstRGB_opt = V_028760_BLEND_OPT_PRESERVE_NONE_IGNORE_NONE;
-               if (si_blend_factor_uses_dst(srcA))
-                       dstA_opt = V_028760_BLEND_OPT_PRESERVE_NONE_IGNORE_NONE;
-
-               if (srcRGB == VK_BLEND_FACTOR_SRC_ALPHA_SATURATE &&
-                   (dstRGB == VK_BLEND_FACTOR_ZERO ||
-                    dstRGB == VK_BLEND_FACTOR_SRC_ALPHA ||
-                    dstRGB == VK_BLEND_FACTOR_SRC_ALPHA_SATURATE))
-                       dstRGB_opt = V_028760_BLEND_OPT_PRESERVE_NONE_IGNORE_A0;
-
-               /* Set the final value. */
-               blend.sx_mrt_blend_opt[i] =
-                       S_028760_COLOR_SRC_OPT(srcRGB_opt) |
-                       S_028760_COLOR_DST_OPT(dstRGB_opt) |
-                       S_028760_COLOR_COMB_FCN(si_translate_blend_opt_function(eqRGB)) |
-                       S_028760_ALPHA_SRC_OPT(srcA_opt) |
-                       S_028760_ALPHA_DST_OPT(dstA_opt) |
-                       S_028760_ALPHA_COMB_FCN(si_translate_blend_opt_function(eqA));
-               blend_cntl |= S_028780_ENABLE(1);
-
-               blend_cntl |= S_028780_COLOR_COMB_FCN(si_translate_blend_function(eqRGB));
-               blend_cntl |= S_028780_COLOR_SRCBLEND(si_translate_blend_factor(srcRGB));
-               blend_cntl |= S_028780_COLOR_DESTBLEND(si_translate_blend_factor(dstRGB));
-               if (srcA != srcRGB || dstA != dstRGB || eqA != eqRGB) {
-                       blend_cntl |= S_028780_SEPARATE_ALPHA_BLEND(1);
-                       blend_cntl |= S_028780_ALPHA_COMB_FCN(si_translate_blend_function(eqA));
-                       blend_cntl |= S_028780_ALPHA_SRCBLEND(si_translate_blend_factor(srcA));
-                       blend_cntl |= S_028780_ALPHA_DESTBLEND(si_translate_blend_factor(dstA));
-               }
-               blend.cb_blend_control[i] = blend_cntl;
+                       /* Blending optimizations for RB+.
+                        * These transformations don't change the behavior.
+                        *
+                        * First, get rid of DST in the blend factors:
+                        *    func(src * DST, dst * 0) ---> func(src * 0, dst * SRC)
+                        */
+                       si_blend_remove_dst(&eqRGB, &srcRGB, &dstRGB,
+                                           VK_BLEND_FACTOR_DST_COLOR,
+                                           VK_BLEND_FACTOR_SRC_COLOR);
+
+                       si_blend_remove_dst(&eqA, &srcA, &dstA,
+                                           VK_BLEND_FACTOR_DST_COLOR,
+                                           VK_BLEND_FACTOR_SRC_COLOR);
+
+                       si_blend_remove_dst(&eqA, &srcA, &dstA,
+                                           VK_BLEND_FACTOR_DST_ALPHA,
+                                           VK_BLEND_FACTOR_SRC_ALPHA);
+
+                       /* Look up the ideal settings from tables. */
+                       srcRGB_opt = si_translate_blend_opt_factor(srcRGB, false);
+                       dstRGB_opt = si_translate_blend_opt_factor(dstRGB, false);
+                       srcA_opt = si_translate_blend_opt_factor(srcA, true);
+                       dstA_opt = si_translate_blend_opt_factor(dstA, true);
+
+                       /* Handle interdependencies. */
+                       if (si_blend_factor_uses_dst(srcRGB))
+                               dstRGB_opt = V_028760_BLEND_OPT_PRESERVE_NONE_IGNORE_NONE;
+                       if (si_blend_factor_uses_dst(srcA))
+                               dstA_opt = V_028760_BLEND_OPT_PRESERVE_NONE_IGNORE_NONE;
+
+                       if (srcRGB == VK_BLEND_FACTOR_SRC_ALPHA_SATURATE &&
+                           (dstRGB == VK_BLEND_FACTOR_ZERO ||
+                            dstRGB == VK_BLEND_FACTOR_SRC_ALPHA ||
+                            dstRGB == VK_BLEND_FACTOR_SRC_ALPHA_SATURATE))
+                               dstRGB_opt = V_028760_BLEND_OPT_PRESERVE_NONE_IGNORE_A0;
+
+                       /* Set the final value. */
+                       blend.sx_mrt_blend_opt[i] =
+                               S_028760_COLOR_SRC_OPT(srcRGB_opt) |
+                               S_028760_COLOR_DST_OPT(dstRGB_opt) |
+                               S_028760_COLOR_COMB_FCN(si_translate_blend_opt_function(eqRGB)) |
+                               S_028760_ALPHA_SRC_OPT(srcA_opt) |
+                               S_028760_ALPHA_DST_OPT(dstA_opt) |
+                               S_028760_ALPHA_COMB_FCN(si_translate_blend_opt_function(eqA));
+                       blend_cntl |= S_028780_ENABLE(1);
+
+                       blend_cntl |= S_028780_COLOR_COMB_FCN(si_translate_blend_function(eqRGB));
+                       blend_cntl |= S_028780_COLOR_SRCBLEND(si_translate_blend_factor(srcRGB));
+                       blend_cntl |= S_028780_COLOR_DESTBLEND(si_translate_blend_factor(dstRGB));
+                       if (srcA != srcRGB || dstA != dstRGB || eqA != eqRGB) {
+                               blend_cntl |= S_028780_SEPARATE_ALPHA_BLEND(1);
+                               blend_cntl |= S_028780_ALPHA_COMB_FCN(si_translate_blend_function(eqA));
+                               blend_cntl |= S_028780_ALPHA_SRCBLEND(si_translate_blend_factor(srcA));
+                               blend_cntl |= S_028780_ALPHA_DESTBLEND(si_translate_blend_factor(dstA));
+                       }
+                       blend.cb_blend_control[i] = blend_cntl;
 
-               blend.blend_enable_4bit |= 0xfu << (i * 4);
+                       blend.blend_enable_4bit |= 0xfu << (i * 4);
 
-               if (srcRGB == VK_BLEND_FACTOR_SRC_ALPHA ||
-                   dstRGB == VK_BLEND_FACTOR_SRC_ALPHA ||
-                   srcRGB == VK_BLEND_FACTOR_SRC_ALPHA_SATURATE ||
-                   dstRGB == VK_BLEND_FACTOR_SRC_ALPHA_SATURATE ||
-                   srcRGB == VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA ||
-                   dstRGB == VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA)
-                       blend.need_src_alpha |= 1 << i;
-       }
-       for (i = vkblend->attachmentCount; i < 8; i++) {
-               blend.cb_blend_control[i] = 0;
-               blend.sx_mrt_blend_opt[i] = S_028760_COLOR_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED) | S_028760_ALPHA_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED);
+                       if (srcRGB == VK_BLEND_FACTOR_SRC_ALPHA ||
+                           dstRGB == VK_BLEND_FACTOR_SRC_ALPHA ||
+                           srcRGB == VK_BLEND_FACTOR_SRC_ALPHA_SATURATE ||
+                           dstRGB == VK_BLEND_FACTOR_SRC_ALPHA_SATURATE ||
+                           srcRGB == VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA ||
+                           dstRGB == VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA)
+                               blend.need_src_alpha |= 1 << i;
+               }
+               for (i = vkblend->attachmentCount; i < 8; i++) {
+                       blend.cb_blend_control[i] = 0;
+                       blend.sx_mrt_blend_opt[i] = S_028760_COLOR_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED) | S_028760_ALPHA_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED);
+               }
        }
 
        if (pipeline->device->physical_device->rad_info.has_rbplus) {
@@ -855,7 +917,8 @@ radv_pipeline_init_blend_state(struct radv_pipeline *pipeline,
                /* RB+ doesn't work with dual source blending, logic op and
                 * RESOLVE.
                 */
-               if (blend.mrt0_is_dual_src || vkblend->logicOpEnable ||
+               if (blend.mrt0_is_dual_src ||
+                   (vkblend && vkblend->logicOpEnable) ||
                    mode == V_028808_CB_RESOLVE)
                        blend.cb_color_control |= S_028808_DISABLE_DUAL_QUAD(1);
        }
@@ -908,10 +971,27 @@ static uint32_t si_translate_fill(VkPolygonMode func)
        }
 }
 
-static uint8_t radv_pipeline_get_ps_iter_samples(const VkPipelineMultisampleStateCreateInfo *vkms)
+static uint8_t radv_pipeline_get_ps_iter_samples(const VkGraphicsPipelineCreateInfo *pCreateInfo)
 {
-       uint32_t num_samples = vkms->rasterizationSamples;
+       const VkPipelineMultisampleStateCreateInfo *vkms = pCreateInfo->pMultisampleState;
+       RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
+       struct radv_subpass *subpass = &pass->subpasses[pCreateInfo->subpass];
        uint32_t ps_iter_samples = 1;
+       uint32_t num_samples;
+
+       /* From the Vulkan 1.1.129 spec, 26.7. Sample Shading:
+        *
+        * "If the VK_AMD_mixed_attachment_samples extension is enabled and the
+        *  subpass uses color attachments, totalSamples is the number of
+        *  samples of the color attachments. Otherwise, totalSamples is the
+        *  value of VkPipelineMultisampleStateCreateInfo::rasterizationSamples
+        *  specified at pipeline creation time."
+        */
+       if (subpass->has_color_att) {
+               num_samples = subpass->color_sample_count;
+       } else {
+               num_samples = vkms->rasterizationSamples;
+       }
 
        if (vkms->sampleShadingEnable) {
                ps_iter_samples = ceil(vkms->minSampleShading * num_samples);
@@ -988,13 +1068,15 @@ radv_pipeline_out_of_order_rast(struct radv_pipeline *pipeline,
 {
        RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
        struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
+       const VkPipelineDepthStencilStateCreateInfo *vkds = radv_pipeline_get_depth_stencil_state(pCreateInfo);
+       const VkPipelineColorBlendStateCreateInfo *vkblend = radv_pipeline_get_color_blend_state(pCreateInfo);
        unsigned colormask = blend->cb_target_enabled_4bit;
 
        if (!pipeline->device->physical_device->out_of_order_rast_allowed)
                return false;
 
        /* Be conservative if a logic operation is enabled with color buffers. */
-       if (colormask && pCreateInfo->pColorBlendState->logicOpEnable)
+       if (colormask && vkblend && vkblend->logicOpEnable)
                return false;
 
        /* Default depth/stencil invariance when no attachment is bound. */
@@ -1002,10 +1084,7 @@ radv_pipeline_out_of_order_rast(struct radv_pipeline *pipeline,
                .zs = true, .pass_set = true
        };
 
-       if (pCreateInfo->pDepthStencilState &&
-           subpass->depth_stencil_attachment) {
-               const VkPipelineDepthStencilStateCreateInfo *vkds =
-                       pCreateInfo->pDepthStencilState;
+       if (vkds) {
                struct radv_render_pass_attachment *attachment =
                        pass->attachments + subpass->depth_stencil_attachment->attachment;
                bool has_stencil = vk_format_is_stencil(attachment->format);
@@ -1092,7 +1171,7 @@ radv_pipeline_init_multisample_state(struct radv_pipeline *pipeline,
                                     struct radv_blend_state *blend,
                                     const VkGraphicsPipelineCreateInfo *pCreateInfo)
 {
-       const VkPipelineMultisampleStateCreateInfo *vkms = pCreateInfo->pMultisampleState;
+       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;
        bool out_of_order_rast = false;
@@ -1121,7 +1200,7 @@ radv_pipeline_init_multisample_state(struct radv_pipeline *pipeline,
                if (pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.force_persample) {
                        ps_iter_samples = ms->num_samples;
                } else {
-                       ps_iter_samples = radv_pipeline_get_ps_iter_samples(vkms);
+                       ps_iter_samples = radv_pipeline_get_ps_iter_samples(pCreateInfo);
                }
        } else {
                ms->num_samples = 1;
@@ -1164,11 +1243,15 @@ radv_pipeline_init_multisample_state(struct radv_pipeline *pipeline,
                                S_028A48_VPORT_SCISSOR_ENABLE(1);
 
        if (ms->num_samples > 1) {
+               RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
+               struct radv_subpass *subpass = &pass->subpasses[pCreateInfo->subpass];
+               uint32_t z_samples = subpass->depth_stencil_attachment ? subpass->depth_sample_count : ms->num_samples;
                unsigned log_samples = util_logbase2(ms->num_samples);
+               unsigned log_z_samples = util_logbase2(z_samples);
                unsigned log_ps_iter_samples = util_logbase2(ps_iter_samples);
                ms->pa_sc_mode_cntl_0 |= S_028A48_MSAA_ENABLE(1);
                ms->pa_sc_line_cntl |= S_028BDC_EXPAND_LINE_WIDTH(1); /* CM_R_028BDC_PA_SC_LINE_CNTL */
-               ms->db_eqaa |= S_028804_MAX_ANCHOR_SAMPLES(log_samples) |
+               ms->db_eqaa |= S_028804_MAX_ANCHOR_SAMPLES(log_z_samples) |
                        S_028804_PS_ITER_SAMPLES(log_ps_iter_samples) |
                        S_028804_MASK_EXPORT_NUM_SAMPLES(log_samples) |
                        S_028804_ALPHA_TO_MASK_NUM_SAMPLES(log_samples);
@@ -2265,14 +2348,16 @@ radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline,
                }
        }
 
-       if (pCreateInfo->pTessellationState)
-               key.tess_input_vertices = pCreateInfo->pTessellationState->patchControlPoints;
-
+       const VkPipelineTessellationStateCreateInfo *tess =
+               radv_pipeline_get_tessellation_state(pCreateInfo);
+       if (tess)
+               key.tess_input_vertices = tess->patchControlPoints;
 
-       if (pCreateInfo->pMultisampleState &&
-           pCreateInfo->pMultisampleState->rasterizationSamples > 1) {
-               uint32_t num_samples = pCreateInfo->pMultisampleState->rasterizationSamples;
-               uint32_t ps_iter_samples = radv_pipeline_get_ps_iter_samples(pCreateInfo->pMultisampleState);
+       const VkPipelineMultisampleStateCreateInfo *vkms =
+               radv_pipeline_get_multisample_state(pCreateInfo);
+       if (vkms && vkms->rasterizationSamples > 1) {
+               uint32_t num_samples = vkms->rasterizationSamples;
+               uint32_t ps_iter_samples = radv_pipeline_get_ps_iter_samples(pCreateInfo);
                key.num_samples = num_samples;
                key.log2_ps_iter_samples = util_logbase2(ps_iter_samples);
        }
@@ -2365,20 +2450,35 @@ radv_fill_shader_keys(struct radv_device *device,
                                keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg = false;
                }
 
-               if (!device->physical_device->use_ngg_streamout) {
-                       gl_shader_stage last_xfb_stage = MESA_SHADER_VERTEX;
+               gl_shader_stage last_xfb_stage = MESA_SHADER_VERTEX;
 
-                       for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_GEOMETRY; i++) {
-                               if (nir[i])
-                                       last_xfb_stage = i;
-                       }
+               for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_GEOMETRY; i++) {
+                       if (nir[i])
+                               last_xfb_stage = i;
+               }
 
-                       if (nir[last_xfb_stage] &&
-                           radv_nir_stage_uses_xfb(nir[last_xfb_stage])) {
-                               if (nir[MESA_SHADER_TESS_CTRL])
-                                       keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg = false;
-                               else
-                                       keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg = false;
+               bool uses_xfb = nir[last_xfb_stage] &&
+                               radv_nir_stage_uses_xfb(nir[last_xfb_stage]);
+
+               if (!device->physical_device->use_ngg_streamout && uses_xfb) {
+                       if (nir[MESA_SHADER_TESS_CTRL])
+                               keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg = false;
+                       else
+                               keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg = false;
+               }
+
+               /* Determine if the pipeline is eligible for the NGG passthrough
+                * mode. It can't be enabled for geometry shaders, for NGG
+                * streamout or for vertex shaders that export the primitive ID
+                * (this is checked later because we don't have the info here.)
+                */
+               if (!nir[MESA_SHADER_GEOMETRY] && !uses_xfb) {
+                       if (nir[MESA_SHADER_TESS_CTRL] &&
+                           keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg) {
+                               keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg_passthrough = true;
+                       } else if (nir[MESA_SHADER_VERTEX] &&
+                                  keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg) {
+                               keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg_passthrough = true;
                        }
                }
        }
@@ -2454,6 +2554,16 @@ radv_fill_shader_info(struct radv_pipeline *pipeline,
                keys[MESA_SHADER_TESS_EVAL].vs_common_out.export_clip_dists =
                        !!infos[MESA_SHADER_FRAGMENT].ps.num_input_clips_culls;
 
+               /* NGG passthrough mode can't be enabled for vertex shaders
+                * that export the primitive ID.
+                *
+                * TODO: I should really refactor the keys logic.
+                */
+               if (nir[MESA_SHADER_VERTEX] &&
+                   keys[MESA_SHADER_VERTEX].vs_common_out.export_prim_id) {
+                       keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg_passthrough = false;
+               }
+
                filled_stages |= (1 << MESA_SHADER_FRAGMENT);
        }
 
@@ -2605,9 +2715,10 @@ void radv_stop_feedback(VkPipelineCreationFeedbackEXT *feedback, bool cache_hit)
 }
 
 static
-bool radv_aco_supported_stage(gl_shader_stage stage, bool has_gs, bool has_ts)
+bool radv_aco_supported_stage(gl_shader_stage stage, bool has_ts)
 {
-       return (stage == MESA_SHADER_VERTEX && !has_gs && !has_ts) ||
+       return (stage == MESA_SHADER_VERTEX && !has_ts) ||
+              (stage == MESA_SHADER_GEOMETRY && !has_ts) ||
               stage == MESA_SHADER_FRAGMENT ||
               stage == MESA_SHADER_COMPUTE;
 }
@@ -2672,7 +2783,6 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
                modules[MESA_SHADER_FRAGMENT] = &fs_m;
        }
 
-       bool has_gs = modules[MESA_SHADER_GEOMETRY];
        bool has_ts = modules[MESA_SHADER_TESS_CTRL] || modules[MESA_SHADER_TESS_EVAL];
        bool use_aco = device->physical_device->use_aco;
 
@@ -2684,7 +2794,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
 
                radv_start_feedback(stage_feedbacks[i]);
 
-               bool aco = use_aco && radv_aco_supported_stage(i, has_gs, has_ts);
+               bool aco = use_aco && radv_aco_supported_stage(i, has_ts);
                nir[i] = radv_shader_compile_to_nir(device, modules[i],
                                                    stage ? stage->pName : "main", i,
                                                    stage ? stage->pSpecializationInfo : NULL,
@@ -2716,18 +2826,20 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
                                           nir_lower_non_uniform_texture_access |
                                           nir_lower_non_uniform_image_access);
 
-                       bool aco = use_aco && radv_aco_supported_stage(i, has_gs, has_ts);
+                       bool aco = use_aco && radv_aco_supported_stage(i, has_ts);
                        if (!aco)
                                NIR_PASS_V(nir[i], nir_lower_bool_to_int32);
                }
-
-               if (radv_can_dump_shader(device, modules[i], false))
-                       nir_print_shader(nir[i], stderr);
        }
 
        if (nir[MESA_SHADER_FRAGMENT])
                radv_lower_fs_io(nir[MESA_SHADER_FRAGMENT]);
 
+       for (int i = 0; i < MESA_SHADER_STAGES; ++i) {
+               if (radv_can_dump_shader(device, modules[i], false))
+                       nir_print_shader(nir[i], stderr);
+       }
+
        radv_fill_shader_keys(device, keys, key, nir);
 
        radv_fill_shader_info(pipeline, pStages, keys, infos, nir);
@@ -2753,11 +2865,48 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
                gfx9_get_gs_info(key, pipeline, nir, infos, gs_info);
        }
 
+       if(modules[MESA_SHADER_GEOMETRY]) {
+               struct radv_shader_binary *gs_copy_binary = NULL;
+               if (!pipeline->gs_copy_shader &&
+                   !radv_pipeline_has_ngg(pipeline)) {
+                       struct radv_shader_info info = {};
+                       struct radv_shader_variant_key key = {};
+
+                       key.has_multiview_view_index =
+                               keys[MESA_SHADER_GEOMETRY].has_multiview_view_index;
+
+                       radv_nir_shader_info_pass(nir[MESA_SHADER_GEOMETRY],
+                                                 pipeline->layout, &key,
+                                                 &info);
+                       info.wave_size = 64; /* Wave32 not supported. */
+
+                       pipeline->gs_copy_shader = radv_create_gs_copy_shader(
+                                       device, nir[MESA_SHADER_GEOMETRY], &info,
+                                       &gs_copy_binary, keep_executable_info,
+                                       keys[MESA_SHADER_GEOMETRY].has_multiview_view_index,
+                                       use_aco);
+               }
+
+               if (!keep_executable_info && pipeline->gs_copy_shader) {
+                       struct radv_shader_binary *binaries[MESA_SHADER_STAGES] = {NULL};
+                       struct radv_shader_variant *variants[MESA_SHADER_STAGES] = {0};
+
+                       binaries[MESA_SHADER_GEOMETRY] = gs_copy_binary;
+                       variants[MESA_SHADER_GEOMETRY] = pipeline->gs_copy_shader;
+
+                       radv_pipeline_cache_insert_shaders(device, cache,
+                                                          gs_copy_hash,
+                                                          variants,
+                                                          binaries);
+               }
+               free(gs_copy_binary);
+       }
+
        if (nir[MESA_SHADER_FRAGMENT]) {
                if (!pipeline->shaders[MESA_SHADER_FRAGMENT]) {
                        radv_start_feedback(stage_feedbacks[MESA_SHADER_FRAGMENT]);
 
-                       bool aco = use_aco && radv_aco_supported_stage(MESA_SHADER_FRAGMENT, has_gs, has_ts);
+                       bool aco = use_aco && radv_aco_supported_stage(MESA_SHADER_FRAGMENT, has_ts);
                        pipeline->shaders[MESA_SHADER_FRAGMENT] =
                               radv_shader_variant_compile(device, modules[MESA_SHADER_FRAGMENT], &nir[MESA_SHADER_FRAGMENT], 1,
                                                          pipeline->layout, keys + MESA_SHADER_FRAGMENT,
@@ -2767,20 +2916,6 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
 
                        radv_stop_feedback(stage_feedbacks[MESA_SHADER_FRAGMENT], false);
                }
-
-               /* TODO: These are no longer used as keys we should refactor this */
-               keys[MESA_SHADER_VERTEX].vs_common_out.export_prim_id =
-                       pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.prim_id_input;
-               keys[MESA_SHADER_VERTEX].vs_common_out.export_layer_id =
-                       pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.layer_input;
-               keys[MESA_SHADER_VERTEX].vs_common_out.export_clip_dists =
-                       !!pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.num_input_clips_culls;
-               keys[MESA_SHADER_TESS_EVAL].vs_common_out.export_prim_id =
-                       pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.prim_id_input;
-               keys[MESA_SHADER_TESS_EVAL].vs_common_out.export_layer_id =
-                       pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.layer_input;
-               keys[MESA_SHADER_TESS_EVAL].vs_common_out.export_clip_dists =
-                       !!pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.num_input_clips_culls;
        }
 
        if (device->physical_device->rad_info.chip_class >= GFX9 && modules[MESA_SHADER_TESS_CTRL]) {
@@ -2810,10 +2945,11 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
 
                        radv_start_feedback(stage_feedbacks[MESA_SHADER_GEOMETRY]);
 
+                       bool aco = use_aco && radv_aco_supported_stage(MESA_SHADER_GEOMETRY, has_ts);
                        pipeline->shaders[MESA_SHADER_GEOMETRY] = radv_shader_variant_compile(device, modules[MESA_SHADER_GEOMETRY], combined_nir, 2,
                                                                                             pipeline->layout,
                                                                                             &keys[pre_stage], &infos[MESA_SHADER_GEOMETRY], keep_executable_info,
-                                                                                            false, &binaries[MESA_SHADER_GEOMETRY]);
+                                                                                            aco, &binaries[MESA_SHADER_GEOMETRY]);
 
                        radv_stop_feedback(stage_feedbacks[MESA_SHADER_GEOMETRY], false);
                }
@@ -2832,7 +2968,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
 
                        radv_start_feedback(stage_feedbacks[i]);
 
-                       bool aco = use_aco && radv_aco_supported_stage(i, has_gs, has_ts);
+                       bool aco = use_aco && radv_aco_supported_stage(i, has_ts);
                        pipeline->shaders[i] = radv_shader_variant_compile(device, modules[i], &nir[i], 1,
                                                                          pipeline->layout,
                                                                          keys + i, infos + i,keep_executable_info,
@@ -2842,42 +2978,6 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
                }
        }
 
-       if(modules[MESA_SHADER_GEOMETRY]) {
-               struct radv_shader_binary *gs_copy_binary = NULL;
-               if (!pipeline->gs_copy_shader &&
-                   !radv_pipeline_has_ngg(pipeline)) {
-                       struct radv_shader_info info = {};
-                       struct radv_shader_variant_key key = {};
-
-                       key.has_multiview_view_index =
-                               keys[MESA_SHADER_GEOMETRY].has_multiview_view_index;
-
-                       radv_nir_shader_info_pass(nir[MESA_SHADER_GEOMETRY],
-                                                 pipeline->layout, &key,
-                                                 &info);
-                       info.wave_size = 64; /* Wave32 not supported. */
-
-                       pipeline->gs_copy_shader = radv_create_gs_copy_shader(
-                                       device, nir[MESA_SHADER_GEOMETRY], &info,
-                                       &gs_copy_binary, keep_executable_info,
-                                       keys[MESA_SHADER_GEOMETRY].has_multiview_view_index);
-               }
-
-               if (!keep_executable_info && pipeline->gs_copy_shader) {
-                       struct radv_shader_binary *binaries[MESA_SHADER_STAGES] = {NULL};
-                       struct radv_shader_variant *variants[MESA_SHADER_STAGES] = {0};
-
-                       binaries[MESA_SHADER_GEOMETRY] = gs_copy_binary;
-                       variants[MESA_SHADER_GEOMETRY] = pipeline->gs_copy_shader;
-
-                       radv_pipeline_cache_insert_shaders(device, cache,
-                                                          gs_copy_hash,
-                                                          variants,
-                                                          binaries);
-               }
-               free(gs_copy_binary);
-       }
-
        if (!keep_executable_info) {
                radv_pipeline_cache_insert_shaders(device, cache, hash, pipeline->shaders,
                                                   binaries);
@@ -3190,7 +3290,8 @@ radv_gfx9_compute_bin_size(struct radv_pipeline *pipeline, const VkGraphicsPipel
        unsigned effective_samples = total_samples;
        unsigned color_bytes_per_pixel = 0;
 
-       const VkPipelineColorBlendStateCreateInfo *vkblend = pCreateInfo->pColorBlendState;
+       const VkPipelineColorBlendStateCreateInfo *vkblend =
+               radv_pipeline_get_color_blend_state(pCreateInfo);
        if (vkblend) {
                for (unsigned i = 0; i < subpass->color_count; i++) {
                        if (!vkblend->pAttachments[i].colorWriteMask)
@@ -3261,7 +3362,8 @@ radv_gfx10_compute_bin_size(struct radv_pipeline *pipeline, const VkGraphicsPipe
        unsigned color_bytes_per_pixel = 0;
        unsigned fmask_bytes_per_pixel = 0;
 
-       const VkPipelineColorBlendStateCreateInfo *vkblend = pCreateInfo->pColorBlendState;
+       const VkPipelineColorBlendStateCreateInfo *vkblend =
+               radv_pipeline_get_color_blend_state(pCreateInfo);
        if (vkblend) {
                for (unsigned i = 0; i < subpass->color_count; i++) {
                        if (!vkblend->pAttachments[i].colorWriteMask)
@@ -3338,7 +3440,8 @@ radv_pipeline_generate_disabled_binning_state(struct radeon_cmdbuf *ctx_cs,
        if (pipeline->device->physical_device->rad_info.chip_class >= GFX10) {
                RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
                struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
-               const VkPipelineColorBlendStateCreateInfo *vkblend = pCreateInfo->pColorBlendState;
+               const VkPipelineColorBlendStateCreateInfo *vkblend =
+                       radv_pipeline_get_color_blend_state(pCreateInfo);
                unsigned min_bytes_per_pixel = 0;
 
                if (vkblend) {
@@ -3369,6 +3472,28 @@ radv_pipeline_generate_disabled_binning_state(struct radeon_cmdbuf *ctx_cs,
        pipeline->graphics.binning.db_dfsm_control = db_dfsm_control;
 }
 
+struct radv_binning_settings
+radv_get_binning_settings(const struct radv_physical_device *pdev)
+{
+       struct radv_binning_settings settings;
+       if (pdev->rad_info.has_dedicated_vram) {
+               settings.context_states_per_bin = 1;
+               settings.persistent_states_per_bin = 1;
+               settings.fpovs_per_batch = 63;
+       } else {
+               /* The context states are affected by the scissor bug. */
+               settings.context_states_per_bin = 6;
+               /* 32 causes hangs for RAVEN. */
+               settings.persistent_states_per_bin = 16;
+               settings.fpovs_per_batch = 63;
+       }
+
+       if (pdev->rad_info.has_gfx9_scissor_bug)
+               settings.context_states_per_bin = 1;
+
+       return settings;
+}
+
 static void
 radv_pipeline_generate_binning_state(struct radeon_cmdbuf *ctx_cs,
                                     struct radv_pipeline *pipeline,
@@ -3387,21 +3512,8 @@ radv_pipeline_generate_binning_state(struct radeon_cmdbuf *ctx_cs,
                unreachable("Unhandled generation for binning bin size calculation");
 
        if (pipeline->device->pbb_allowed && bin_size.width && bin_size.height) {
-               unsigned context_states_per_bin; /* allowed range: [1, 6] */
-               unsigned persistent_states_per_bin; /* allowed range: [1, 32] */
-               unsigned fpovs_per_batch; /* allowed range: [0, 255], 0 = unlimited */
-
-               if (pipeline->device->physical_device->rad_info.has_dedicated_vram) {
-                       context_states_per_bin = 1;
-                       persistent_states_per_bin = 1;
-                       fpovs_per_batch = 63;
-               } else {
-                       /* The context states are affected by the scissor bug. */
-                       context_states_per_bin = pipeline->device->physical_device->rad_info.has_gfx9_scissor_bug ? 1 : 6;
-                       /* 32 causes hangs for RAVEN. */
-                       persistent_states_per_bin = 16;
-                       fpovs_per_batch = 63;
-               }
+               struct radv_binning_settings settings =
+                       radv_get_binning_settings(pipeline->device->physical_device);
 
                bool disable_start_of_prim = true;
                uint32_t db_dfsm_control = S_028060_PUNCHOUT_MODE(V_028060_FORCE_OFF);
@@ -3422,10 +3534,10 @@ radv_pipeline_generate_binning_state(struct radeon_cmdbuf *ctx_cs,
                        S_028C44_BIN_SIZE_Y(bin_size.height == 16) |
                        S_028C44_BIN_SIZE_X_EXTEND(util_logbase2(MAX2(bin_size.width, 32)) - 5) |
                        S_028C44_BIN_SIZE_Y_EXTEND(util_logbase2(MAX2(bin_size.height, 32)) - 5) |
-                       S_028C44_CONTEXT_STATES_PER_BIN(context_states_per_bin - 1) |
-                       S_028C44_PERSISTENT_STATES_PER_BIN(persistent_states_per_bin - 1) |
+                       S_028C44_CONTEXT_STATES_PER_BIN(settings.context_states_per_bin - 1) |
+                       S_028C44_PERSISTENT_STATES_PER_BIN(settings.persistent_states_per_bin - 1) |
                        S_028C44_DISABLE_START_OF_PRIM(disable_start_of_prim) |
-                       S_028C44_FPOVS_PER_BATCH(fpovs_per_batch) |
+                       S_028C44_FPOVS_PER_BATCH(settings.fpovs_per_batch) |
                        S_028C44_OPTIMAL_BIN_SELECTION(1);
 
                pipeline->graphics.binning.pa_sc_binner_cntl_0 = pa_sc_binner_cntl_0;
@@ -3441,7 +3553,7 @@ radv_pipeline_generate_depth_stencil_state(struct radeon_cmdbuf *ctx_cs,
                                            const VkGraphicsPipelineCreateInfo *pCreateInfo,
                                            const struct radv_graphics_pipeline_create_info *extra)
 {
-       const VkPipelineDepthStencilStateCreateInfo *vkds = pCreateInfo->pDepthStencilState;
+       const VkPipelineDepthStencilStateCreateInfo *vkds = 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_shader_variant *ps = pipeline->shaders[MESA_SHADER_FRAGMENT];
@@ -3648,7 +3760,10 @@ radv_pipeline_generate_multisample_state(struct radeon_cmdbuf *ctx_cs,
        radeon_emit(ctx_cs, ms->pa_sc_aa_mask[1]);
 
        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
         * if no sample lies on the pixel boundary (-8 sample offset). It's
@@ -3658,6 +3773,12 @@ radv_pipeline_generate_multisample_state(struct radeon_cmdbuf *ctx_cs,
        radeon_set_context_reg(ctx_cs, R_02882C_PA_SU_PRIM_FILTER_CNTL,
                               S_02882C_XMAX_RIGHT_EXCLUSION(exclusion) |
                               S_02882C_YMAX_BOTTOM_EXCLUSION(exclusion));
+
+       /* GFX9: Flush DFSM when the AA mode changes. */
+       if (pipeline->device->dfsm_allowed) {
+               radeon_emit(ctx_cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(ctx_cs, EVENT_TYPE(V_028A90_FLUSH_DFSM) | EVENT_INDEX(0));
+       }
 }
 
 static void
@@ -3874,7 +3995,7 @@ radv_pipeline_generate_hw_ngg(struct radeon_cmdbuf *ctx_cs,
 
        radeon_set_context_reg(ctx_cs, R_028A84_VGT_PRIMITIVEID_EN,
                               S_028A84_PRIMITIVEID_EN(es_enable_prim_id) |
-                              S_028A84_NGG_DISABLE_PROVOK_REUSE(es_enable_prim_id));
+                              S_028A84_NGG_DISABLE_PROVOK_REUSE(outinfo->export_prim_id));
 
        radeon_set_context_reg(ctx_cs, R_028AAC_VGT_ESGS_RING_ITEMSIZE,
                               ngg_state->vgt_esgs_ring_itemsize);
@@ -3910,7 +4031,7 @@ radv_pipeline_generate_hw_ngg(struct radeon_cmdbuf *ctx_cs,
                                                                !radv_pipeline_has_gs(pipeline)));
 
        ge_cntl = S_03096C_PRIM_GRP_SIZE(ngg_state->max_gsprims) |
-                 S_03096C_VERT_GRP_SIZE(ngg_state->hw_max_esverts) |
+                 S_03096C_VERT_GRP_SIZE(256) | /* 256 = disable vertex grouping */
                  S_03096C_BREAK_WAVE_AT_EOI(break_wave_at_eoi);
 
        /* Bug workaround for a possible hang with non-tessellation cases.
@@ -4134,13 +4255,20 @@ radv_pipeline_generate_geometry_shader(struct radeon_cmdbuf *ctx_cs,
                              gs->info.gs.vertices_out);
 }
 
-static uint32_t offset_to_ps_input(uint32_t offset, bool flat_shade, bool float16)
+static uint32_t offset_to_ps_input(uint32_t offset, bool flat_shade,
+                                  bool explicit, bool float16)
 {
        uint32_t ps_input_cntl;
        if (offset <= AC_EXP_PARAM_OFFSET_31) {
                ps_input_cntl = S_028644_OFFSET(offset);
-               if (flat_shade)
+               if (flat_shade || explicit)
                        ps_input_cntl |= S_028644_FLAT_SHADE(1);
+               if (explicit) {
+                       /* Force parameter cache to be read in passthrough
+                        * mode.
+                        */
+                       ps_input_cntl |= S_028644_OFFSET(1 << 5);
+               }
                if (float16) {
                        ps_input_cntl |= S_028644_FP16_INTERP_MODE(1) |
                                         S_028644_ATTR0_VALID(1);
@@ -4169,7 +4297,7 @@ radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs,
        if (ps->info.ps.prim_id_input) {
                unsigned vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_PRIMITIVE_ID];
                if (vs_offset != AC_EXP_PARAM_UNDEFINED) {
-                       ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, true, false);
+                       ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, true, false, false);
                        ++ps_offset;
                }
        }
@@ -4178,9 +4306,9 @@ radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs,
            ps->info.needs_multiview_view_index) {
                unsigned vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_LAYER];
                if (vs_offset != AC_EXP_PARAM_UNDEFINED)
-                       ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, true, false);
+                       ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, true, false, false);
                else
-                       ps_input_cntl[ps_offset] = offset_to_ps_input(AC_EXP_PARAM_DEFAULT_VAL_0000, true, false);
+                       ps_input_cntl[ps_offset] = offset_to_ps_input(AC_EXP_PARAM_DEFAULT_VAL_0000, true, false, false);
                ++ps_offset;
        }
 
@@ -4196,14 +4324,14 @@ radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs,
 
                vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_CLIP_DIST0];
                if (vs_offset != AC_EXP_PARAM_UNDEFINED) {
-                       ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, false, false);
+                       ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, false, false, false);
                        ++ps_offset;
                }
 
                vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_CLIP_DIST1];
                if (vs_offset != AC_EXP_PARAM_UNDEFINED &&
                    ps->info.ps.num_input_clips_culls > 4) {
-                       ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, false, false);
+                       ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, false, false, false);
                        ++ps_offset;
                }
        }
@@ -4211,6 +4339,7 @@ radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs,
        for (unsigned i = 0; i < 32 && (1u << i) <= ps->info.ps.input_mask; ++i) {
                unsigned vs_offset;
                bool flat_shade;
+               bool explicit;
                bool float16;
                if (!(ps->info.ps.input_mask & (1u << i)))
                        continue;
@@ -4223,9 +4352,10 @@ radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs,
                }
 
                flat_shade = !!(ps->info.ps.flat_shaded_mask & (1u << ps_offset));
+               explicit = !!(ps->info.ps.explicit_shaded_mask & (1u << ps_offset));
                float16 = !!(ps->info.ps.float16_shaded_mask & (1u << ps_offset));
 
-               ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, flat_shade, float16);
+               ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, flat_shade, explicit, float16);
                ++ps_offset;
        }
 
@@ -4358,6 +4488,8 @@ radv_compute_vgt_shader_stages_en(const struct radv_pipeline *pipeline)
                stages |= S_028B54_PRIMGEN_EN(1);
                if (pipeline->streamout_shader)
                        stages |= S_028B54_NGG_WAVE_ID_EN(1);
+               if (radv_pipeline_has_ngg_passthrough(pipeline))
+                       stages |= S_028B54_PRIMGEN_PASSTHRU_EN(1);
        } else if (radv_pipeline_has_gs(pipeline)) {
                stages |= S_028B54_VS_EN(V_028B54_VS_STAGE_COPY_SHADER);
        }
@@ -4430,20 +4562,17 @@ gfx10_pipeline_generate_ge_cntl(struct radeon_cmdbuf *ctx_cs,
 {
        bool break_wave_at_eoi = false;
        unsigned primgroup_size;
-       unsigned vertgroup_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 */
-               vertgroup_size = 0;
        } else if (radv_pipeline_has_gs(pipeline)) {
                const struct gfx9_gs_info *gs_state =
                        &pipeline->shaders[MESA_SHADER_GEOMETRY]->info.gs_ring_info;
                unsigned vgt_gs_onchip_cntl = gs_state->vgt_gs_onchip_cntl;
                primgroup_size = G_028A44_GS_PRIMS_PER_SUBGRP(vgt_gs_onchip_cntl);
-               vertgroup_size = G_028A44_ES_VERTS_PER_SUBGRP(vgt_gs_onchip_cntl);
        } else {
                primgroup_size = 128; /* recommended without a GS and tess */
-               vertgroup_size = 0;
        }
 
        if (radv_pipeline_has_tess(pipeline)) {