OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl/link_varyings: Fix hash table leak

Browse Source 
Hash tables were not destroyed at return.

v2: Use ralloc_context (Eric Anholt)

Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Yevhenii Kolesnikov
2019-07-10 13:44:44 +03:00
parent 712ac83033
commit 8c5692b696
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/glsl/link_varyings.cpp
View File

@@ -2581,14 +2581,15 @@ assign_varying_locations(struct gl_context *ctx,
ctx->Extensions.ARB_enhanced_layouts, ctx->Extensions.ARB_enhanced_layouts,
producer ? producer->Stage : MESA_SHADER_NONE, producer ? producer->Stage : MESA_SHADER_NONE,
consumer ? consumer->Stage : MESA_SHADER_NONE); consumer ? consumer->Stage : MESA_SHADER_NONE);
void *hash_table_ctx = ralloc_context(NULL);
hash_table *tfeedback_candidates = hash_table *tfeedback_candidates =
_mesa_hash_table_create(NULL, _mesa_key_hash_string, _mesa_hash_table_create(hash_table_ctx, _mesa_key_hash_string,
_mesa_key_string_equal); _mesa_key_string_equal);
hash_table *consumer_inputs = hash_table *consumer_inputs =
_mesa_hash_table_create(NULL, _mesa_key_hash_string, _mesa_hash_table_create(hash_table_ctx, _mesa_key_hash_string,
_mesa_key_string_equal); _mesa_key_string_equal);
hash_table *consumer_interface_inputs = hash_table *consumer_interface_inputs =
_mesa_hash_table_create(NULL, _mesa_key_hash_string, _mesa_hash_table_create(hash_table_ctx, _mesa_key_hash_string,
_mesa_key_string_equal); _mesa_key_string_equal);
ir_variable *consumer_inputs_with_locations[VARYING_SLOT_TESS_MAX] = { ir_variable *consumer_inputs_with_locations[VARYING_SLOT_TESS_MAX] = {
NULL, NULL,
@@ -2684,6 +2685,7 @@ assign_varying_locations(struct gl_context *ctx,
linker_error(prog, "output %s is assigned to stream=%d but " linker_error(prog, "output %s is assigned to stream=%d but "
"is linked to an input, which requires stream=0", "is linked to an input, which requires stream=0",
output_var->name, output_var->data.stream); output_var->name, output_var->data.stream);
ralloc_free(hash_table_ctx);
return false; return false;
} }
} }
@@ -2710,7 +2712,7 @@ assign_varying_locations(struct gl_context *ctx,
= tfeedback_decls[i].find_candidate(prog, tfeedback_candidates); = tfeedback_decls[i].find_candidate(prog, tfeedback_candidates);
if (matched_candidate == NULL) { if (matched_candidate == NULL) {
_mesa_hash_table_destroy(tfeedback_candidates, NULL); ralloc_free(hash_table_ctx);
return false; return false;
} }
@@ -2739,9 +2741,6 @@ assign_varying_locations(struct gl_context *ctx,
} }
} }
_mesa_hash_table_destroy(consumer_inputs, NULL);
_mesa_hash_table_destroy(consumer_interface_inputs, NULL);
uint8_t components[MAX_VARYINGS_INCL_PATCH] = {0}; uint8_t components[MAX_VARYINGS_INCL_PATCH] = {0};
const unsigned slots_used = matches.assign_locations( const unsigned slots_used = matches.assign_locations(
prog, components, reserved_slots); prog, components, reserved_slots);
@@ -2750,12 +2749,12 @@ assign_varying_locations(struct gl_context *ctx,
for (unsigned i = 0; i < num_tfeedback_decls; ++i) { for (unsigned i = 0; i < num_tfeedback_decls; ++i) {
if (tfeedback_decls[i].is_varying()) { if (tfeedback_decls[i].is_varying()) {
if (!tfeedback_decls[i].assign_location(ctx, prog)) { if (!tfeedback_decls[i].assign_location(ctx, prog)) {
_mesa_hash_table_destroy(tfeedback_candidates, NULL); ralloc_free(hash_table_ctx);
return false; return false;
} }
} }
} }
_mesa_hash_table_destroy(tfeedback_candidates, NULL); ralloc_free(hash_table_ctx);
if (consumer && producer) { if (consumer && producer) {
foreach_in_list(ir_instruction, node, consumer->ir) { foreach_in_list(ir_instruction, node, consumer->ir) {