Mesa (master): mesa: replace _mesa_problem() with assert() in hash table

Timothy Arceri tarceri at kemper.freedesktop.org
Tue May 16 02:31:56 UTC 2017


Module: Mesa
Branch: master
Commit: 59b9544fa751aa9559fe34f2e7af7b87d44440c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=59b9544fa751aa9559fe34f2e7af7b87d44440c9

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Tue May  9 12:27:41 2017 +1000

mesa: replace _mesa_problem() with assert() in hash table

There should be no way the OpenGL test suites don't hit the assert()
should we do something to cause this code path to be taken.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/mesa/main/hash.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index a3772bdfb5..5b9132a311 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -339,12 +339,10 @@ _mesa_HashRemove_unlocked(struct _mesa_HashTable *table, GLuint key)
    assert(table);
    assert(key);
 
-   /* have to check this outside of mutex lock */
-   if (table->InDeleteAll) {
-      _mesa_problem(NULL, "_mesa_HashRemove illegally called from "
-                    "_mesa_HashDeleteAll callback function");
-      return;
-   }
+   /* assert if _mesa_HashRemove illegally called from _mesa_HashDeleteAll
+    * callback function. Have to check this outside of mutex lock.
+    */
+   assert(!table->InDeleteAll);
 
    if (key == DELETED_KEY_VALUE) {
       table->deleted_key_data = NULL;




More information about the mesa-commit mailing list