Module: Mesa Branch: master Commit: 29d70cc964411e86bcd0bbc5591b3d82f849c9f8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=29d70cc964411e86bcd0bbc5591b3d82f849c9f8
Author: Timothy Arceri <[email protected]> Date: Wed Jul 27 09:52:04 2016 +1000 glsl: free hash tables earlier These are only used by get_matching_input() which has been call at this point so free the hash tables. Reviewed-by: Iago Toral Quiroga <[email protected]> --- src/compiler/glsl/link_varyings.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index f6778b6..b4799d2 100644 --- a/src/compiler/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp @@ -2156,6 +2156,9 @@ assign_varying_locations(struct gl_context *ctx, } } + hash_table_dtor(consumer_inputs); + hash_table_dtor(consumer_interface_inputs); + for (unsigned i = 0; i < num_tfeedback_decls; ++i) { if (!tfeedback_decls[i].is_varying()) continue; @@ -2165,8 +2168,6 @@ assign_varying_locations(struct gl_context *ctx, if (matched_candidate == NULL) { hash_table_dtor(tfeedback_candidates); - hash_table_dtor(consumer_inputs); - hash_table_dtor(consumer_interface_inputs); return false; } @@ -2185,15 +2186,10 @@ assign_varying_locations(struct gl_context *ctx, if (!tfeedback_decls[i].assign_location(ctx, prog)) { hash_table_dtor(tfeedback_candidates); - hash_table_dtor(consumer_inputs); - hash_table_dtor(consumer_interface_inputs); return false; } } - hash_table_dtor(tfeedback_candidates); - hash_table_dtor(consumer_inputs); - hash_table_dtor(consumer_interface_inputs); if (consumer && producer) { foreach_in_list(ir_instruction, node, consumer->ir) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
