Mesa (staging/21.3): vulkan/log: Don't assert on non-client-visible objects

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: ea42411badc6f697b296e696918ed2b59b138c48
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea42411badc6f697b296e696918ed2b59b138c48

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Oct 13 11:07:24 2021 -0500

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 at intel.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13341>
(cherry picked from commit 116e23e3855a28e74e09517d0005200fd139dc88)

---

 .pick_status.json        | 2 +-
 src/vulkan/util/vk_log.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9120b0e5dae..9b86f11c25e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -17698,7 +17698,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;
    }
 }