From 141137ad14fe5d8df93b202ccdfa976aee26146f Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Tue, 12 Sep 2023 22:30:01 -0500
Subject: [PATCH] nak: Use count_attribute_slots for FS input var sizes

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
---
 src/nouveau/compiler/nak.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nouveau/compiler/nak.rs b/src/nouveau/compiler/nak.rs
index ccd41077c2e..9d20723cc11 100644
--- a/src/nouveau/compiler/nak.rs
+++ b/src/nouveau/compiler/nak.rs
@@ -378,7 +378,8 @@ fn encode_hdr_for_nir(
             let loc_u32 = u32::try_from(var.data.location).unwrap();
             let slot =
                 (loc_u32 - VARYING_SLOT_VAR0) * 4 + var.data.location_frac();
-            let num_slots = unsafe { glsl_get_component_slots(var.type_) };
+            let num_slots =
+                unsafe { glsl_count_attribute_slots(var.type_, false) * 4 };
             let mode: u8 = match var.data.interpolation() {
                 INTERP_MODE_NONE | INTERP_MODE_SMOOTH => 2, /* Perspective */
                 INTERP_MODE_FLAT => 1,                      /* Constant */