summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2016-01-11 15:07:27 -0500
committerNicolai Hähnle <nicolai.haehnle@amd.com>2016-02-03 14:03:35 +0100
commit55fb921d691f6d2d9e1ab105adb63a61fea7dc50 (patch)
treebddb67a6c1016f629a6f9771d166247d3fed0e28 /src
parent8b11d8cfbfaaf72755e6c200140e253cb3e3fa8a (diff)
util/hash_table: add _mesa_hash_table_num_entries
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/hash.c4
-rw-r--r--src/util/hash_table.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 315b5d64004..ab1b9e907ae 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -496,14 +496,12 @@ _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
GLuint
_mesa_HashNumEntries(const struct _mesa_HashTable *table)
{
- struct hash_entry *entry;
GLuint count = 0;
if (table->deleted_key_data)
count++;
- hash_table_foreach(table->ht, entry)
- count++;
+ count += _mesa_hash_table_num_entries(table->ht);
return count;
}
diff --git a/src/util/hash_table.h b/src/util/hash_table.h
index 611dcf810dc..85b013cac24 100644
--- a/src/util/hash_table.h
+++ b/src/util/hash_table.h
@@ -69,6 +69,11 @@ void _mesa_hash_table_clear(struct hash_table *ht,
void _mesa_hash_table_set_deleted_key(struct hash_table *ht,
const void *deleted_key);
+static inline uint32_t _mesa_hash_table_num_entries(struct hash_table *ht)
+{
+ return ht->entries;
+}
+
struct hash_entry *
_mesa_hash_table_insert(struct hash_table *ht, const void *key, void *data);
struct hash_entry *