diff options
author | Jason Ekstrand <jason@jlekstrand.net> | 2021-10-04 16:36:23 -0500 |
---|---|---|
committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-04-24 21:04:53 -0700 |
commit | a1c167da48c7bddc4acfa6f2f9b7b4810039a5e4 (patch) | |
tree | 6d21af58fc048171957aa37fdaacbeba7264bc78 | |
parent | acc3752a103c3168935d31d1b65d5400c1222e80 (diff) |
util/set: Respect found in search_or_add_pre_hashed
Fixes: 491e7decad0f "util/set: add the found param to search_or_add"
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13184>
(cherry picked from commit 21a7b0f1abbfc3ed0ebf1194ef530ca2497616e5)
-rw-r--r-- | .pick_status.json | 2 | ||||
-rw-r--r-- | src/util/set.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index a5b10d22730..71ee7749fc1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -535,7 +535,7 @@ "description": "util/set: Respect found in search_or_add_pre_hashed", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "491e7decad0f46b6d5f2e517cc0ea18193cf2f33" }, diff --git a/src/util/set.c b/src/util/set.c index 37bd689e81a..2a3c1665865 100644 --- a/src/util/set.c +++ b/src/util/set.c @@ -531,7 +531,7 @@ _mesa_set_search_or_add_pre_hashed(struct set *set, uint32_t hash, { assert(set->key_hash_function == NULL || hash == set->key_hash_function(key)); - return set_search_or_add(set, hash, key, NULL); + return set_search_or_add(set, hash, key, found); } /** |