From 9c2042f2ce4c6f8746153138692fb06954ec2ed7 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 27 Oct 2016 14:47:09 +1100 Subject: [PATCH] mesa/glsl: copy num_images to gl_program We should be able to free gl_linked_shader after linking in order to do so we need to switch to getting values from gl_program instead. Reviewed-by: Emil Velikov --- src/compiler/glsl/glsl_to_nir.cpp | 1 - src/mesa/main/shaderapi.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index 096ab4c5e2a..fef89f9272a 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -151,7 +151,6 @@ glsl_to_nir(const struct gl_shader_program *shader_prog, shader->info->num_ubos = sh->NumUniformBlocks; shader->info->num_abos = shader_prog->NumAtomicBuffers; shader->info->num_ssbos = sh->NumShaderStorageBlocks; - shader->info->num_images = sh->NumImages; shader->info->uses_clip_distance_out = sh->Program->ClipDistanceArraySize != 0; shader->info->separate_shader = shader_prog->SeparateShader; diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index be3c203617d..4d64ae58a98 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2165,6 +2165,8 @@ _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; + switch (dst_sh->Stage) { case MESA_SHADER_VERTEX: dst->ClipDistanceArraySize = src->Vert.ClipDistanceArraySize; -- 2.30.2