From 0e17bb509e6d3bd767ebb29894467e3394f8ad38 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 12 Oct 2020 16:44:18 -0700
Subject: [PATCH] mesa: Open-code hash walk in _mesa_HashPrint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously the deleted key data would get printed at the beginning and
the end.  I don't think that was intentional, so I changed it.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7171>
---
 src/mesa/main/hash.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 2f36fc84425..c58cb48839e 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -378,23 +378,21 @@ _mesa_HashWalkLocked(const struct _mesa_HashTable *table,
    hash_walk_unlocked(table, callback, userData);
 }
 
-static void
-debug_print_entry(GLuint key, void *data, void *userData)
-{
-   _mesa_debug(NULL, "%u %p\n", key, data);
-}
-
 /**
  * Dump contents of hash table for debugging.
- * 
+ *
  * \param table the hash table.
  */
 void
 _mesa_HashPrint(const struct _mesa_HashTable *table)
 {
    if (table->deleted_key_data)
-      debug_print_entry(DELETED_KEY_VALUE, table->deleted_key_data, NULL);
-   _mesa_HashWalk(table, debug_print_entry, NULL);
+      _mesa_debug(NULL, "%u %p\n", DELETED_KEY_VALUE, table->deleted_key_data);
+
+   hash_table_foreach(table->ht, entry) {
+      _mesa_debug(NULL, "%u %p\n", (unsigned)(uintptr_t) entry->key,
+                  entry->data);
+   }
 }