diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2021-10-13 11:07:24 -0500 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-12-29 20:56:28 +0000 |
| commit | d8715ff19b9720fd78be2bff47490a3f97a73e9e (patch) | |
| tree | 94ac47a29d89d3d2869b1bbc27622eb492c0719a | |
| parent | 4d28da1f8e1ffeadaff6899ede756638f09ba40f (diff) | |
vulkan/log: Don't assert on non-client-visible objects
We already have code to deal with non-client-visible objects but we were
asserting if it didn't fall into one of the clearly mappable error
cases. However, we didn't have a mapping for VK_ERROR_NOT_PERMITTED
which can happen during object creation. Let's just be sloppy and drop
the assert. Worst case, the client gets an error with no object.
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13341>
(cherry picked from commit 116e23e3855a28e74e09517d0005200fd139dc88)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/vulkan/util/vk_log.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 8ae954c6644..34db407728a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -19372,7 +19372,7 @@ "description": "vulkan/log: Don't assert on non-client-visible objects", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/vulkan/util/vk_log.c b/src/vulkan/util/vk_log.c index 95962d0b42c..8ca33edf943 100644 --- a/src/vulkan/util/vk_log.c +++ b/src/vulkan/util/vk_log.c @@ -268,7 +268,6 @@ vk_object_for_error(struct vk_object_base *obj, VkResult error) case VK_ERROR_TOO_MANY_OBJECTS: return &vk_object_to_device(obj)->base; default: - assert(obj->client_visible); return obj; } } |