From f461fa1933357e59e79707d3a18a002f49fa4d35 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 18 Aug 2022 14:54:15 +0200
Subject: [PATCH] radv: use NIR_PASS with radv_export_implicit_primitive_id
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For consistency.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18138>
---
 src/amd/vulkan/radv_pipeline.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 51764655c1f..07b7c6ddf71 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2682,7 +2682,8 @@ radv_link_shaders(struct radv_pipeline *pipeline,
        !(stages[last_vgt_api_stage].nir->info.outputs_written & VARYING_BIT_PRIMITIVE_ID) &&
        ((last_vgt_api_stage == MESA_SHADER_VERTEX && !stages[MESA_SHADER_VERTEX].info.is_ngg) ||
         (last_vgt_api_stage == MESA_SHADER_TESS_EVAL && !stages[MESA_SHADER_TESS_EVAL].info.is_ngg))) {
-      radv_export_implicit_primitive_id(stages[last_vgt_api_stage].nir);
+      nir_shader *last_vgt_shader = stages[last_vgt_api_stage].nir;
+      NIR_PASS(_, last_vgt_shader, radv_export_implicit_primitive_id);
    }
 
    if (!optimize_conservatively) {