From 03eec294b90759be48b5c85fda5e54bed683068f Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Tue, 8 Sep 2020 13:22:12 +0300 Subject: [PATCH] st/nir: Call st_glsl_to_nir_post_opts before interface unification MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since 95415a54c007a909f0fb9d1b2567beecbd73d403 st_finalize_nir_before_variants calls to nir_shader_gather_info, so finalization should be moved before interface unification. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3482 Fixes: 95415a54c007a909f0fb9d1b2567beecbd73d403 Signed-off-by: Danylo Piliaiev Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_glsl_to_nir.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 089a134..29d5313 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -807,6 +807,8 @@ st_link_nir(struct gl_context *ctx, struct gl_linked_shader *shader = linked_shader[i]; struct shader_info *info = &shader->Program->nir->info; + st_glsl_to_nir_post_opts(st, shader->Program, shader_program); + if (prev_info && ctx->Const.ShaderCompilerOptions[shader->Stage].NirOptions->unify_interfaces) { prev_info->outputs_written |= info->inputs_read & @@ -824,7 +826,6 @@ st_link_nir(struct gl_context *ctx, struct gl_linked_shader *shader = linked_shader[i]; struct gl_program *prog = shader->Program; struct st_program *stp = st_program(prog); - st_glsl_to_nir_post_opts(st, prog, shader_program); /* Initialize st_vertex_program members. */ if (shader->Stage == MESA_SHADER_VERTEX) -- 2.7.4