summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/shader/symbol_table.c20
-rw-r--r--src/mesa/shader/symbol_table.h1
2 files changed, 18 insertions, 3 deletions
diff --git a/src/mesa/shader/symbol_table.c b/src/mesa/shader/symbol_table.c
index b90c495cdb7..71ce1287f54 100644
--- a/src/mesa/shader/symbol_table.c
+++ b/src/mesa/shader/symbol_table.c
@@ -325,10 +325,24 @@ _mesa_symbol_table_ctor(void)
{
struct _mesa_symbol_table *table = calloc(1, sizeof(*table));
- table->ht = hash_table_ctor(32, hash_table_string_hash,
- hash_table_string_compare);
+ if (table != NULL) {
+ table->ht = hash_table_ctor(32, hash_table_string_hash,
+ hash_table_string_compare);
- _mesa_symbol_table_push_scope(table);
+ _mesa_symbol_table_push_scope(table);
+ }
return table;
}
+
+
+void
+_mesa_symbol_table_dtor(struct _mesa_symbol_table *table)
+{
+ while (table->current_scope != NULL) {
+ _mesa_symbol_table_pop_scope(table);
+ }
+
+ hash_table_dtor(table->ht);
+ free(table);
+}
diff --git a/src/mesa/shader/symbol_table.h b/src/mesa/shader/symbol_table.h
index c543615761d..0c054ef1396 100644
--- a/src/mesa/shader/symbol_table.h
+++ b/src/mesa/shader/symbol_table.h
@@ -38,6 +38,7 @@ extern void *_mesa_symbol_table_find_symbol(
extern struct _mesa_symbol_table *_mesa_symbol_table_ctor(void);
+extern void _mesa_symbol_table_dtor(struct _mesa_symbol_table *);
extern struct _mesa_symbol_table_iterator *_mesa_symbol_table_iterator_ctor(
struct _mesa_symbol_table *table, int name_space, const char *name);