From: Samuel Pitoiset Date: Wed, 10 Jul 2019 13:18:54 +0000 (+0200) Subject: radv: use the generic export path for clip/cull distances X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b368fc8c3adde9f0f24e3bf8a3f23fe790bf45a;p=mesa.git radv: use the generic export path for clip/cull distances When they are exported to the next stage. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index c0ff3210bd2..b83fee304fb 100644 --- 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));