From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 23 Apr 2008 16:29:52 +0000 (-0600)
Subject: gallium: fix broken hashing for vertex translation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=333976c90aafa602816defef3e4cc4a418601a51;p=mesa.git

gallium: fix broken hashing for vertex translation

It seems we get hash collisions fairly easily and the code as it was didn't
deal with that properly.

I think we need a simpler hashing interface...
---

diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch.c b/src/gallium/auxiliary/draw/draw_pt_fetch.c
index 93da811ed81..a8d4be5b64b 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch.c
@@ -70,13 +70,21 @@ static struct translate *cached_translate(struct pt_fetch *fetch,
    struct cso_hash_iter iter = cso_hash_find(fetch->hash, hash_key);
    struct translate *translate = 0;
 
-   if (cso_hash_iter_is_null(iter)) {
+   while (!cso_hash_iter_is_null(iter)) {
+      void *iter_data = cso_hash_iter_data(iter);
+      if (memcmp(iter_data, key, sizeof(*key)) == 0) {
+         /* found */
+         translate = cso_hash_iter_data(iter);
+         break;
+      }
+      iter = cso_hash_iter_next(iter);
+      /*debug_printf("\tOK with %d\n", hash_key);*/
+   }
+
+   if (!translate) {
+      /* create/insert */
       translate = translate_create(key);
       cso_hash_insert(fetch->hash, hash_key, translate);
-      /*debug_printf("\tCREATED with %d\n", hash_key);*/
-   } else {
-      translate = cso_hash_iter_data(iter);
-      /*debug_printf("\tOK with %d\n", hash_key);*/
    }
 
    return translate;