KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/glsl: copy num_abos 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 16:17:19 +11:00
parent ba40c8b03c
commit 5581f2a8f2
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/glsl/glsl_to_nir.cpp
View File

@ -149,7 +149,6 @@ glsl_to_nir(const struct gl_shader_program *shader_prog,
shader->info->label = ralloc_strdup(shader, shader_prog->Label);
shader->info->num_textures = util_last_bit(sh->Program->SamplersUsed);
shader->info->num_ubos = sh->NumUniformBlocks;
shader->info->num_abos = shader_prog->NumAtomicBuffers;
shader->info->num_ssbos = sh->NumShaderStorageBlocks;
shader->info->uses_clip_distance_out =
sh->Program->ClipDistanceArraySize != 0;

1
src/mesa/main/shaderapi.c
View File

@ -2165,6 +2165,7 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src,
struct gl_program *dst = dst_sh->Program;
dst->info.num_abos = dst_sh->NumAtomicBuffers;
dst->info.num_images = dst_sh->NumImages;
switch (dst_sh->Stage) {