radv: simplify lowering NGG GS intrinsics
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Mon, 24 Jul 2023 15:28:07 +0000 (17:28 +0200)
committerMarge Bot <emma+marge@anholt.net>
Wed, 26 Jul 2023 07:44:49 +0000 (07:44 +0000)
The is_ngg field is already set correctly for GS.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24313>

src/amd/vulkan/radv_pipeline_graphics.c

index 3d1b79a..a9c5d8d 100644 (file)
@@ -2613,10 +2613,9 @@ radv_graphics_pipeline_compile(struct radv_graphics_pipeline *pipeline, const Vk
    radv_fill_shader_info_ngg(device, pipeline, pipeline_key, stages);
 
    if (stages[MESA_SHADER_GEOMETRY].nir) {
-      gl_shader_stage pre_stage = stages[MESA_SHADER_TESS_EVAL].nir ? MESA_SHADER_TESS_EVAL : MESA_SHADER_VERTEX;
       unsigned nir_gs_flags = nir_lower_gs_intrinsics_per_stream;
 
-      if (stages[pre_stage].info.is_ngg) {
+      if (stages[MESA_SHADER_GEOMETRY].info.is_ngg) {
          nir_gs_flags |= nir_lower_gs_intrinsics_count_primitives |
                          nir_lower_gs_intrinsics_count_vertices_per_primitive |
                          nir_lower_gs_intrinsics_overwrite_incomplete;