X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Fcso_cache%2Fcso_hash.h;h=e984f117c95c437afd48cbcaf22693aea4b4ac80;hb=a142bb899291ae68d00f552959cf6ee1cbb9e6c2;hp=5891c325fa567ee027540611e7561326bef58ca3;hpb=b0caa10a85b39f0e657dc0c4816884c9356b0b1a;p=mesa.git

diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.h b/src/gallium/auxiliary/cso_cache/cso_hash.h
index 5891c325fa5..e984f117c95 100644
--- a/src/gallium/auxiliary/cso_cache/cso_hash.h
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.h
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -38,7 +38,7 @@
  * had the same key (e.g. memcmp could be used on the data to check
  * that)
  * 
- * @author Zack Rusin <zack@tungstengraphics.com>
+ * @author Zack Rusin <zackr@vmware.com>
  */
 
 #ifndef CSO_HASH_H
@@ -51,21 +51,32 @@ extern "C" {
 #endif
 
 
-struct cso_hash;
-struct cso_node;
-
+struct cso_node {
+   struct cso_node *next;
+   void *value;
+   unsigned key;
+};
 
 struct cso_hash_iter {
    struct cso_hash *hash;
    struct cso_node  *node;
 };
 
+struct cso_hash {
+   struct cso_node *fakeNext;
+   struct cso_node **buckets;
+   struct cso_node *end;
+   int size;
+   short userNumBits;
+   short numBits;
+   int numBuckets;
+};
 
-struct cso_hash *cso_hash_create(void);
-void             cso_hash_delete(struct cso_hash *hash);
+void cso_hash_init(struct cso_hash *hash);
+void cso_hash_deinit(struct cso_hash *hash);
 
 
-int              cso_hash_size(struct cso_hash *hash);
+int cso_hash_size(struct cso_hash *hash);
 
 
 /**
@@ -85,29 +96,21 @@ struct cso_hash_iter cso_hash_insert(struct cso_hash *hash, unsigned key,
  */
 struct cso_hash_iter cso_hash_erase(struct cso_hash *hash, struct cso_hash_iter iter);
 
-void  *cso_hash_take(struct cso_hash *hash, unsigned key);
+void *cso_hash_take(struct cso_hash *hash, unsigned key);
 
 
 
 struct cso_hash_iter cso_hash_first_node(struct cso_hash *hash);
 
-/**
- * Return an iterator pointing to the first entry in the collision list.
- */
-struct cso_hash_iter cso_hash_find(struct cso_hash *hash, unsigned key);
-
 /**
  * Returns true if a value with the given key exists in the hash
  */
-boolean   cso_hash_contains(struct cso_hash *hash, unsigned key);
+bool cso_hash_contains(struct cso_hash *hash, unsigned key);
 
 
-int       cso_hash_iter_is_null(struct cso_hash_iter iter);
-unsigned  cso_hash_iter_key(struct cso_hash_iter iter);
-void     *cso_hash_iter_data(struct cso_hash_iter iter);
+unsigned cso_hash_iter_key(struct cso_hash_iter iter);
 
 
-struct cso_hash_iter cso_hash_iter_next(struct cso_hash_iter iter);
 struct cso_hash_iter cso_hash_iter_prev(struct cso_hash_iter iter);
 
 
@@ -116,11 +119,60 @@ struct cso_hash_iter cso_hash_iter_prev(struct cso_hash_iter iter);
  * comparison to see which entry in the list is a direct copy of our template
  * and returns that entry.
  */
-void *cso_hash_find_data_from_template( struct cso_hash *hash,
-				        unsigned hash_key,
-				        void *templ,
-				        int size );
+void *cso_hash_find_data_from_template(struct cso_hash *hash,
+				       unsigned hash_key,
+				       void *templ,
+				       int size);
+
+struct cso_node *cso_hash_data_next(struct cso_node *node);
+
+static inline bool
+cso_hash_iter_is_null(struct cso_hash_iter iter)
+{
+   return !iter.node || iter.node == iter.hash->end;
+}
+
+static inline void *
+cso_hash_iter_data(struct cso_hash_iter iter)
+{
+   if (!iter.node || iter.hash->end == iter.node)
+      return NULL;
+   return iter.node->value;
+}
+
+static inline struct cso_node **
+cso_hash_find_node(struct cso_hash *hash, unsigned akey)
+{
+   struct cso_node **node;
+
+   if (hash->numBuckets) {
+      node = &hash->buckets[akey % hash->numBuckets];
+      assert(*node == hash->end || (*node)->next);
+      while (*node != hash->end && (*node)->key != akey)
+         node = &(*node)->next;
+   } else {
+      node = &hash->end;
+   }
+   return node;
+}
+
+/**
+ * Return an iterator pointing to the first entry in the collision list.
+ */
+static inline struct cso_hash_iter
+cso_hash_find(struct cso_hash *hash, unsigned key)
+{
+   struct cso_node **nextNode = cso_hash_find_node(hash, key);
+   struct cso_hash_iter iter = {hash, *nextNode};
+   return iter;
+}
 
+static inline struct cso_hash_iter
+cso_hash_iter_next(struct cso_hash_iter iter)
+{
+   struct cso_hash_iter next = {iter.hash, cso_hash_data_next(iter.node)};
+   return next;
+}
 
 #ifdef	__cplusplus
 }