diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 6a7cd61423b..128ba84ca06 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -563,20 +563,12 @@ emit_output(struct ntv_context *ctx, struct nir_variable *var)
       HANDLE_EMIT_BUILTIN(PSIZ, PointSize);
       HANDLE_EMIT_BUILTIN(LAYER, Layer);
       HANDLE_EMIT_BUILTIN(PRIMITIVE_ID, PrimitiveId);
+      HANDLE_EMIT_BUILTIN(CLIP_DIST0, ClipDistance);
       HANDLE_EMIT_BUILTIN(CULL_DIST0, CullDistance);
       HANDLE_EMIT_BUILTIN(VIEWPORT, ViewportIndex);
       HANDLE_EMIT_BUILTIN(TESS_LEVEL_OUTER, TessLevelOuter);
       HANDLE_EMIT_BUILTIN(TESS_LEVEL_INNER, TessLevelInner);
 
-      case VARYING_SLOT_CLIP_DIST0:
-         assert(glsl_type_is_array(var->type));
-         spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInClipDistance);
-         /* this can be as large as 2x vec4, which requires 2 slots */
-         ctx->outputs[VARYING_SLOT_CLIP_DIST1] = var_id;
-         ctx->so_output_gl_types[VARYING_SLOT_CLIP_DIST1] = var->type;
-         ctx->so_output_types[VARYING_SLOT_CLIP_DIST1] = var_type;
-         break;
-
       default:
          slot = handle_handle_slot(ctx, var, true);
          spirv_builder_emit_location(&ctx->builder, var_id, slot);