From: Neil Roberts <nroberts@igalia.com>
Date: Mon, 26 Mar 2018 15:12:41 +0000 (+0200)
Subject: mesa/glspirv: Set separate_shader on shader_info
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a105c1e6e5a42e19b7aa083ec5d370a127cf7824;p=mesa.git

mesa/glspirv: Set separate_shader on shader_info

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 <tarceri@itsqueeze.com>
---

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.