radv: use the generic export path for clip/cull distances

When they are exported to the next stage.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index c0ff3210bd29c4f4f95ec92e539c31ebd24d443b..b83fee304fbd95c69b7ef68315d1efc302b97320 100644 (file)
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -2768,12 +2768,6 @@ handle_vs_outputs_post(struct radv_shader_context *ctx,
                        si_llvm_init_export_args(ctx, &slots[0], 0xf,
                                                  V_008DFC_SQ_EXP_POS + index,
                                                  &pos_args[index]);
-
-                       if (export_clip_dists) {
-                               /* Export the clip/cull distances values to the next stage. */
-                               radv_export_param(ctx, param_count, &slots[0], 0xf);
-                               outinfo->vs_output_param_offset[location] = param_count++;
-                       }
                }
        }
 
@@ -2876,9 +2870,15 @@ handle_vs_outputs_post(struct radv_shader_context *ctx,
 
                if (i != VARYING_SLOT_LAYER &&
                    i != VARYING_SLOT_PRIMITIVE_ID &&
+                   i != VARYING_SLOT_CLIP_DIST0 &&
+                   i != VARYING_SLOT_CLIP_DIST1 &&
                    i < VARYING_SLOT_VAR0)
                        continue;
 
+               if ((i == VARYING_SLOT_CLIP_DIST0 ||
+                    i == VARYING_SLOT_CLIP_DIST1) && !export_clip_dists)
+                       continue;
+
                for (unsigned j = 0; j < 4; j++)
                        values[j] = ac_to_float(&ctx->ac, radv_load_output(ctx, i, j));