Module: Mesa Branch: main Commit: 2cce8500de0fecd3b393385d5fe0972d476ec112 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2cce8500de0fecd3b393385d5fe0972d476ec112
Author: Samuel Pitoiset <[email protected]> Date: Wed Oct 19 15:57:52 2022 +0200 radv: add support for dynamic provoking vertex mode with NGG Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Rhys Perry <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19168> --- src/amd/vulkan/radv_cmd_buffer.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 530dd85d08d..a42ea29fa45 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2191,6 +2191,33 @@ radv_emit_culling(struct radv_cmd_buffer *cmd_buffer) radeon_set_context_reg(cmd_buffer->cs, R_028814_PA_SU_SC_MODE_CNTL, pa_su_sc_mode_cntl); } +static void +radv_emit_provoking_vertex_mode(struct radv_cmd_buffer *cmd_buffer) +{ + struct radv_graphics_pipeline *pipeline = cmd_buffer->state.graphics_pipeline; + const unsigned stage = pipeline->last_vgt_api_stage; + struct radv_dynamic_state *d = &cmd_buffer->state.dynamic; + struct radv_userdata_info *loc = &pipeline->last_vgt_api_stage_locs[AC_UD_NGG_PROVOKING_VTX]; + unsigned provoking_vtx = 0; + uint32_t base_reg; + + if (loc->sgpr_idx == -1) + return; + + if (d->provoking_vertex_mode == VK_PROVOKING_VERTEX_MODE_LAST_VERTEX_EXT) { + if (stage == MESA_SHADER_VERTEX) { + provoking_vtx = si_conv_prim_to_gs_out(d->primitive_topology); + } else { + assert(stage == MESA_SHADER_GEOMETRY); + struct radv_shader *gs = pipeline->base.shaders[stage]; + provoking_vtx = gs->info.gs.vertices_in - 1; + } + } + + base_reg = pipeline->base.user_data_0[stage]; + radeon_set_sh_reg(cmd_buffer->cs, base_reg + loc->sgpr_idx * 4, provoking_vtx); +} + static void radv_emit_primitive_topology(struct radv_cmd_buffer *cmd_buffer) { @@ -3944,6 +3971,9 @@ radv_cmd_buffer_flush_dynamic_state(struct radv_cmd_buffer *cmd_buffer, bool pip RADV_CMD_DIRTY_DYNAMIC_PROVOKING_VERTEX_MODE)) radv_emit_culling(cmd_buffer); + if (states & RADV_CMD_DIRTY_DYNAMIC_PROVOKING_VERTEX_MODE) + radv_emit_provoking_vertex_mode(cmd_buffer); + if (states & RADV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY) radv_emit_primitive_topology(cmd_buffer); @@ -5897,6 +5927,11 @@ radv_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipeline cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_PATCH_CONTROL_POINTS; } + /* Re-emit the provoking vertex mode state because the SGPR idx can be different. */ + if (graphics_pipeline->last_vgt_api_stage_locs[AC_UD_NGG_PROVOKING_VTX].sgpr_idx != -1) { + cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_PROVOKING_VERTEX_MODE; + } + radv_bind_dynamic_state(cmd_buffer, &graphics_pipeline->dynamic_state); radv_bind_vs_input_state(cmd_buffer, graphics_pipeline);
