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 <emil.velikov@collabora.com>
This commit is contained in:
Timothy Arceri
2016-10-27 14:47:09 +11:00
parent 6b82e957be
commit 9c2042f2ce
2 changed files with 2 additions and 1 deletions

View File

@@ -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;

View File

@@ -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;