fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

hash_table: Rename insert_with_hash to insert_pre_hashed

Browse source 
We already have search_pre_hashed.  This makes the APIs match better.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Jason Ekstrand 2015-01-15 07:58:07 -08:00
parent f0aec4ee1e
commit 8ed5305d28
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/glsl/nir/nir_lower_locals_to_regs.c
View file

@ -118,7 +118,7 @@ get_reg_for_deref(nir_deref_var *deref, struct locals_to_regs_state *state)
reg->num_components = glsl_get_vector_elements(tail->type);
reg->num_array_elems = array_size > 1 ? array_size : 0;
_mesa_hash_table_insert_with_hash(state->regs_table, hash, deref, reg);
_mesa_hash_table_insert_pre_hashed(state->regs_table, hash, deref, reg);
return reg;
}

2
src/mesa/main/hash.c
View file

@ -277,7 +277,7 @@ _mesa_HashInsert_unlocked(struct _mesa_HashTable *table, GLuint key, void *data)
if (entry) {
entry->data = data;
} else {
_mesa_hash_table_insert_with_hash(table->ht, hash, uint_key(key), data);
_mesa_hash_table_insert_pre_hashed(table->ht, hash, uint_key(key), data);
}
}
}

4
src/util/hash_table.c
View file

@ -334,8 +334,8 @@ _mesa_hash_table_insert(struct hash_table *ht, const void *key, void *data)
}
struct hash_entry *
_mesa_hash_table_insert_with_hash(struct hash_table *ht, uint32_t hash,
const void *key, void *data)
_mesa_hash_table_insert_pre_hashed(struct hash_table *ht, uint32_t hash,
const void *key, void *data)
{
assert(ht->key_hash_function == NULL || hash == ht->key_hash_function(key));
return hash_table_insert(ht, hash, key, data);

4
src/util/hash_table.h
View file

@ -70,8 +70,8 @@ void _mesa_hash_table_set_deleted_key(struct hash_table *ht,
struct hash_entry *
_mesa_hash_table_insert(struct hash_table *ht, const void *key, void *data);
struct hash_entry *
_mesa_hash_table_insert_with_hash(struct hash_table *ht, uint32_t hash,
const void *key, void *data);
_mesa_hash_table_insert_pre_hashed(struct hash_table *ht, uint32_t hash,
const void *key, void *data);
struct hash_entry *
_mesa_hash_table_search(struct hash_table *ht, const void *key);
struct hash_entry *

8
src/util/tests/hash_table/collision.c
View file

@ -42,8 +42,8 @@ main(int argc, char **argv)
ht = _mesa_hash_table_create(NULL, NULL, _mesa_key_string_equal);
_mesa_hash_table_insert_with_hash(ht, bad_hash, str1, NULL);
_mesa_hash_table_insert_with_hash(ht, bad_hash, str2, NULL);
_mesa_hash_table_insert_pre_hashed(ht, bad_hash, str1, NULL);
_mesa_hash_table_insert_pre_hashed(ht, bad_hash, str2, NULL);
entry1 = _mesa_hash_table_search_pre_hashed(ht, bad_hash, str1);
assert(entry1->key == str1);
@ -63,11 +63,11 @@ main(int argc, char **argv)
/* Put str1 back, then spam junk into the table to force a
* resize and make sure we can still find them both.
*/
_mesa_hash_table_insert_with_hash(ht, bad_hash, str1, NULL);
_mesa_hash_table_insert_pre_hashed(ht, bad_hash, str1, NULL);
for (i = 0; i < 100; i++) {
char *key = malloc(10);
sprintf(key, "spam%d", i);
_mesa_hash_table_insert_with_hash(ht, _mesa_hash_string(key), key, NULL);
_mesa_hash_table_insert_pre_hashed(ht, _mesa_hash_string(key), key, NULL);
}
entry1 = _mesa_hash_table_search_pre_hashed(ht, bad_hash, str1);
assert(entry1->key == str1);