Module: Mesa Branch: staging/23.0 Commit: 17429980bd1dfa67ed9bd661b9d849224efa2952 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17429980bd1dfa67ed9bd661b9d849224efa2952
Author: Eric Engestrom <[email protected]> Date: Mon Apr 17 13:01:41 2023 +0100 vk/util: fix buggy usage of unreachable() Cc: mesa-stable Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22529> (cherry picked from commit 5863bafbdc9b0b5118bd8b2e5bbbe47d5d3ab21a) --- .pick_status.json | 2 +- src/vulkan/util/vk_dispatch_table_gen.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d5d44238d6f..0bf2881607d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2524,7 +2524,7 @@ "description": "vk/util: fix buggy usage of unreachable()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/vulkan/util/vk_dispatch_table_gen.py b/src/vulkan/util/vk_dispatch_table_gen.py index 80488a33fe9..dc5dd76fd92 100644 --- a/src/vulkan/util/vk_dispatch_table_gen.py +++ b/src/vulkan/util/vk_dispatch_table_gen.py @@ -461,7 +461,7 @@ vk_device_entrypoint_is_enabled(int index, uint32_t core_version, #ifdef _MSC_VER VKAPI_ATTR void VKAPI_CALL vk_entrypoint_stub(void) { - unreachable(!"Entrypoint not implemented"); + unreachable("Entrypoint not implemented"); } static const void *get_function_target(const void *func)
