From 316165afec5da7e1bd71d330a1f8bc6dce88a72b Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 11 Apr 2024 08:48:18 +1000 Subject: [PATCH] glsl: use info from shader when linking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We update the program copy of info at the end of linking. During linking we should use the shader copy. This change is required to avoid updating both in the following patch. Reviewed-by: Alejandro Piñeiro Reviewed-by: Marek Olšák Part-of: --- src/compiler/glsl/gl_nir_link_varyings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/gl_nir_link_varyings.c b/src/compiler/glsl/gl_nir_link_varyings.c index c7c66240005..54ad5a50296 100644 --- a/src/compiler/glsl/gl_nir_link_varyings.c +++ b/src/compiler/glsl/gl_nir_link_varyings.c @@ -1678,11 +1678,11 @@ xfb_decl_assign_location(struct xfb_decl *xfb_decl, switch (xfb_decl->lowered_builtin_array_variable) { case clip_distance: actual_array_size = prog->last_vert_prog ? - prog->last_vert_prog->info.clip_distance_array_size : 0; + prog->last_vert_prog->nir->info.clip_distance_array_size : 0; break; case cull_distance: actual_array_size = prog->last_vert_prog ? - prog->last_vert_prog->info.cull_distance_array_size : 0; + prog->last_vert_prog->nir->info.cull_distance_array_size : 0; break; case none: default: