summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-05-09 12:27:41 +1000
committerTimothy Arceri <[email protected]>2017-05-16 12:25:49 +1000
commit59b9544fa751aa9559fe34f2e7af7b87d44440c9 (patch)
tree2eb32cfcecb6faa79798b6b9c8d1633bd00c0f2e /src/mesa/main
parentf25b2f76b031f2427f97a4a4fc58f4d237b764b4 (diff)
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 <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/hash.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index a3772bdfb58..5b9132a3115 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;