[Mesa-dev] [PATCH 21/70] glsl/mesa: set separate_shader directly in shader_info

[Timothy Arceri]

---
 src/compiler/glsl/glsl_to_nir.cpp | 1 -
 src/mesa/main/shaderapi.c         | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index e1b8cea..60451e4 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -152,7 +152,6 @@ glsl_to_nir(const struct gl_shader_program *shader_prog,
    shader->info->num_ssbos = sh->NumShaderStorageBlocks;
    shader->info->uses_clip_distance_out =
       sh->Program->ClipDistanceArraySize != 0;
-   shader->info->separate_shader = shader_prog->SeparateShader;
    shader->info->has_transform_feedback_varyings =
       shader_prog->TransformFeedback.NumVarying > 0;
 
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index f877d16..62ec4df 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2173,6 +2173,7 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src,
    struct gl_program *dst = dst_sh->Program;
 
    dst->info.num_images = dst_sh->NumImages;
+   dst->info.separate_shader = src->SeparateShader;
    dst->info.stage = dst_sh->Stage;
 
    switch (dst_sh->Stage) {
-- 
2.7.4