openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2025-02-22 19:23:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vulkan/log: Don't assert on non-client-visible objects

Browse Source 
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)
This commit is contained in:
Jason Ekstrand 2021-10-13 11:07:24 -05:00 committed by Eric Engestrom
parent 4d28da1f8e
commit d8715ff19b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@ -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
},

1
src/vulkan/util/vk_log.c
View File

@ -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;
}
}