diff options
author | Thomas Helland <[email protected]> | 2017-05-21 15:17:26 +0200 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-05-22 09:19:24 +1000 |
commit | 1575a8146a33bfddb2e498ce77fa0ca8f0f0c85e (patch) | |
tree | 27d65e1ee5cedafae5132b596118ea6f75814afc /src/mesa/main/hash.c | |
parent | f203a9f7d1a7fc4cf41b35a477eb1f3699418fe3 (diff) |
main: Move hashLockMutex/hashUnlockMutex to header and inline
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/main/hash.c')
-rw-r--r-- | src/mesa/main/hash.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c index e352a46aa4b..d7164125599 100644 --- a/src/mesa/main/hash.c +++ b/src/mesa/main/hash.c @@ -35,7 +35,6 @@ */ #include "glheader.h" -#include "imports.h" #include "hash.h" #include "util/hash_table.h" @@ -52,18 +51,6 @@ */ #define DELETED_KEY_VALUE 1 -/** - * The hash table data structure. - */ -struct _mesa_HashTable { - struct hash_table *ht; - GLuint MaxKey; /**< highest key inserted so far */ - mtx_t Mutex; /**< mutual exclusion lock */ - GLboolean InDeleteAll; /**< Debug check */ - /** Value that would be in the table for DELETED_KEY_VALUE. */ - void *deleted_key_data; -}; - /** @{ * Mapping from our use of GLuint as both the key and the hash value to the * hash_table.h API @@ -230,36 +217,6 @@ _mesa_HashLookupLocked(struct _mesa_HashTable *table, GLuint key) } -/** - * Lock the hash table mutex. - * - * This function should be used when multiple objects need - * to be looked up in the hash table, to avoid having to lock - * and unlock the mutex each time. - * - * \param table the hash table. - */ -void -_mesa_HashLockMutex(struct _mesa_HashTable *table) -{ - assert(table); - mtx_lock(&table->Mutex); -} - - -/** - * Unlock the hash table mutex. - * - * \param table the hash table. - */ -void -_mesa_HashUnlockMutex(struct _mesa_HashTable *table) -{ - assert(table); - mtx_unlock(&table->Mutex); -} - - static inline void _mesa_HashInsert_unlocked(struct _mesa_HashTable *table, GLuint key, void *data) { |