[Mesa-dev] [PATCH 3/5] radv: always compute the number of components from the output mask

[Samuel Pitoiset]

That removes two special cases for clip/cull distances.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/amd/vulkan/radv_nir_to_llvm.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 8b881e8f066..1f4ab3365c7 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -1725,16 +1725,11 @@ visit_emit_vertex(struct ac_shader_abi *abi, unsigned stream, LLVMValueRef *addr
 		unsigned output_usage_mask =
 			ctx->shader_info->info.gs.output_usage_mask[i];
 		LLVMValueRef *out_ptr = &addrs[i * 4];
-		int length = 4;
+		int length = util_last_bit(output_usage_mask);
 
 		if (!(ctx->output_mask & (1ull << i)))
 			continue;
 
-		if (i == VARYING_SLOT_CLIP_DIST0) {
-			/* pack clip and cull into a single set of slots */
-			length = util_last_bit(output_usage_mask);
-		}
-
 		for (unsigned j = 0; j < length; j++) {
 			if (!(output_usage_mask & (1 << j)))
 				continue;
@@ -3600,16 +3595,11 @@ ac_gs_copy_shader_emit(struct radv_shader_context *ctx)
 	for (unsigned i = 0; i < AC_LLVM_MAX_OUTPUTS; ++i) {
 		unsigned output_usage_mask =
 			ctx->shader_info->info.gs.output_usage_mask[i];
-		int length = 4;
+		int length = util_last_bit(output_usage_mask);
 
 		if (!(ctx->output_mask & (1ull << i)))
 			continue;
 
-		if (i == VARYING_SLOT_CLIP_DIST0) {
-			/* unpack clip and cull from a single set of slots */
-			length = util_last_bit(output_usage_mask);
-		}
-
 		for (unsigned j = 0; j < length; j++) {
 			LLVMValueRef value, soffset;
 
-- 
2.19.0