From b51bfbdd85da83f08e671b8bf25fa1f9153924ed Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 31 Oct 2016 19:35:49 +1100 Subject: [PATCH] glsl/mesa: set separate_shader directly in shader_info Reviewed-by: Eric Anholt --- 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 fcaca9f8b6c..4127638d2af 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -154,7 +154,6 @@ glsl_to_nir(const struct gl_shader_program *shader_prog, shader->info->num_ssbos = sh->NumShaderStorageBlocks; shader->info->clip_distance_array_size = sh->Program->ClipDistanceArraySize; shader->info->cull_distance_array_size = sh->Program->CullDistanceArraySize; - 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 270c7d6645e..c1e67f36366 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2160,6 +2160,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; switch (dst_sh->Stage) { case MESA_SHADER_VERTEX: -- 2.30.2