radv: fixup geometry clip emission since using the geom pass

Fixes: 2b35b60d: radv: move to using nir clip/cull merge pass.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index d0cb411..91e2a1a 100644 (file)
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4887,7 +4887,8 @@ LLVMModuleRef ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
        ralloc_free(ctx.phis);
 
        if (nir->stage == MESA_SHADER_GEOMETRY) {
-               shader_info->gs.gsvs_vertex_size = util_bitcount64(ctx.output_mask) * 16;
+               unsigned addclip = ctx.num_output_clips + ctx.num_output_culls > 4;
+               shader_info->gs.gsvs_vertex_size = (util_bitcount64(ctx.output_mask) + addclip) * 16;
                shader_info->gs.max_gsvs_emit_size = shader_info->gs.gsvs_vertex_size *
                        nir->info->gs.vertices_out;
        }