radv/ac: handle clip/cull distance sizing in geometry shader outputs

Otherwise we were writing these as 4 components, and things went bad.

Fixes (the remaining):
dEQP-VK.clipping.user_defined.*.vert_geom.*

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
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 8075eda..7c36854 100644 (file)
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4318,17 +4318,19 @@ handle_shader_output_decl(struct nir_to_llvm_context *ctx,
 
        variable->data.driver_location = idx * 4;
 
-       if (ctx->stage == MESA_SHADER_VERTEX) {
-
+       if (ctx->stage == MESA_SHADER_VERTEX ||
+           ctx->stage == MESA_SHADER_GEOMETRY) {
                if (idx == VARYING_SLOT_CLIP_DIST0 ||
                    idx == VARYING_SLOT_CULL_DIST0) {
                        int length = glsl_get_length(variable->type);
-                       if (idx == VARYING_SLOT_CLIP_DIST0) {
-                               ctx->shader_info->vs.clip_dist_mask = (1 << length) - 1;
-                               ctx->num_clips = length;
-                       } else if (idx == VARYING_SLOT_CULL_DIST0) {
-                               ctx->shader_info->vs.cull_dist_mask = (1 << length) - 1;
-                               ctx->num_culls = length;
+                       if (ctx->stage == MESA_SHADER_VERTEX) {
+                               if (idx == VARYING_SLOT_CLIP_DIST0) {
+                                       ctx->shader_info->vs.clip_dist_mask = (1 << length) - 1;
+                                       ctx->num_clips = length;
+                               } else if (idx == VARYING_SLOT_CULL_DIST0) {
+                                       ctx->shader_info->vs.cull_dist_mask = (1 << length) - 1;
+                                       ctx->num_culls = length;
+                               }
                        }
                        if (length > 4)
                                attrib_count = 2;