From a083a25a808101aa2044f60959e3fb79b4888403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Thu, 11 Apr 2024 01:02:03 +0200 Subject: [PATCH] nir/opt_varyings: Fix explicit and per-vertex FS inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 772149b15ae59056364a880a7715aeb68631d3db Signed-off-by: Timur Kristóf Reviewed-by: Marek Olšák Part-of: --- src/compiler/nir/nir_opt_varyings.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir_opt_varyings.c b/src/compiler/nir/nir_opt_varyings.c index f02e049f847..e7e98c94353 100644 --- a/src/compiler/nir/nir_opt_varyings.c +++ b/src/compiler/nir/nir_opt_varyings.c @@ -4000,20 +4000,20 @@ compact_varyings(struct linkage_info *linkage, /* Assign INTERP_MODE_EXPLICIT. Both FP32 and FP16 can occupy the same * slot because the vertex data is passed to FS as-is. */ - fs_assign_slots(linkage, assigned_mask, NULL, + fs_assign_slots(linkage, assigned_mask, assigned_fs_vec4_type, linkage->interp_explicit32_mask, FS_VEC4_TYPE_INTERP_EXPLICIT, 2, NUM_SCALAR_SLOTS, false, 0, progress); - fs_assign_slots(linkage, assigned_mask, NULL, + fs_assign_slots(linkage, assigned_mask, assigned_fs_vec4_type, linkage->interp_explicit16_mask, FS_VEC4_TYPE_INTERP_EXPLICIT, 1, NUM_SCALAR_SLOTS, false, 0, progress); /* Same for strict vertex ordering. */ - fs_assign_slots(linkage, assigned_mask, NULL, + fs_assign_slots(linkage, assigned_mask, assigned_fs_vec4_type, linkage->interp_explicit_strict32_mask, FS_VEC4_TYPE_INTERP_EXPLICIT_STRICT, 2, NUM_SCALAR_SLOTS, false, 0, progress); - fs_assign_slots(linkage, assigned_mask, NULL, + fs_assign_slots(linkage, assigned_mask, assigned_fs_vec4_type, linkage->interp_explicit_strict16_mask, FS_VEC4_TYPE_INTERP_EXPLICIT_STRICT, 1, NUM_SCALAR_SLOTS, false, 0, progress);