From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Mon, 11 Jan 2016 20:07:27 +0000 (-0500)
Subject: util/hash_table: add _mesa_hash_table_num_entries
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55fb921d691f6d2d9e1ab105adb63a61fea7dc50;hp=8b11d8cfbfaaf72755e6c200140e253cb3e3fa8a;p=mesa.git

util/hash_table: add _mesa_hash_table_num_entries

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

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 *