mtx_t glsl_type::hash_mutex = _MTX_INITIALIZER_NP;
hash_table *glsl_type::explicit_matrix_types = NULL;
hash_table *glsl_type::array_types = NULL;
-hash_table *glsl_type::record_types = NULL;
+hash_table *glsl_type::struct_types = NULL;
hash_table *glsl_type::interface_types = NULL;
hash_table *glsl_type::function_types = NULL;
hash_table *glsl_type::subroutine_types = NULL;
glsl_type::array_types = NULL;
}
- if (glsl_type::record_types != NULL) {
- _mesa_hash_table_destroy(glsl_type::record_types, hash_free_type_function);
- glsl_type::record_types = NULL;
+ if (glsl_type::struct_types != NULL) {
+ _mesa_hash_table_destroy(glsl_type::struct_types, hash_free_type_function);
+ glsl_type::struct_types = NULL;
}
if (glsl_type::interface_types != NULL) {
mtx_lock(&glsl_type::hash_mutex);
- if (record_types == NULL) {
- record_types = _mesa_hash_table_create(NULL, record_key_hash,
+ if (struct_types == NULL) {
+ struct_types = _mesa_hash_table_create(NULL, record_key_hash,
record_key_compare);
}
- const struct hash_entry *entry = _mesa_hash_table_search(record_types,
+ const struct hash_entry *entry = _mesa_hash_table_search(struct_types,
&key);
if (entry == NULL) {
const glsl_type *t = new glsl_type(fields, num_fields, name);
- entry = _mesa_hash_table_insert(record_types, t, (void *) t);
+ entry = _mesa_hash_table_insert(struct_types, t, (void *) t);
}
assert(((glsl_type *) entry->data)->base_type == GLSL_TYPE_STRUCT);
/** Hash table containing the known array types. */
static struct hash_table *array_types;
- /** Hash table containing the known record types. */
- static struct hash_table *record_types;
+ /** Hash table containing the known struct types. */
+ static struct hash_table *struct_types;
/** Hash table containing the known interface types. */
static struct hash_table *interface_types;