From a105c1e6e5a42e19b7aa083ec5d370a127cf7824 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 26 Mar 2018 17:12:41 +0200 Subject: [PATCH] mesa/glspirv: Set separate_shader on shader_info MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The value is copied from the gl_program. If we don’t do this then it will get reset back to zero in brw_shader_gather_info. This isn’t a problem for GLSL because in that case the nir_shader is initialised with a copy of the shader_info from the gl_program. Reviewed-by: Timothy Arceri --- src/mesa/main/glspirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/main/glspirv.c b/src/mesa/main/glspirv.c index 5a2d6a4bb2a..4fc80b72181 100644 --- a/src/mesa/main/glspirv.c +++ b/src/mesa/main/glspirv.c @@ -252,6 +252,8 @@ _mesa_spirv_to_nir(struct gl_context *ctx, prog->Name); nir_validate_shader(nir); + nir->info.separate_shader = linked_shader->Program->info.separate_shader; + /* We have to lower away local constant initializers right before we * inline functions. That way they get properly initialized at the top * of the function and not at the top of its caller. -- 2.30.2