diff options
| author | Timothy Arceri <[email protected]> | 2016-10-27 16:17:19 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-11-17 12:52:24 +1100 |
| commit | 5581f2a8f27cda7a9d239ab655829d9159af5544 (patch) | |
| tree | cb7a9dea3b8fdeb67dc289ca32fa9093b203152e | |
| parent | ba40c8b03cb5250af771c50ff785bd5ec293e3c1 (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/compiler/glsl/glsl_to_nir.cpp | 1 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index fef89f9272a..e1b8cea600d 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -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; diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 4d64ae58a98..5db41375006 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -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) { |