From 9d8fdeb296d43c5b533ab320690be10a0c656d2e Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 17 Apr 2023 13:01:41 +0100 Subject: [PATCH] vk/util: fix buggy usage of unreachable() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: (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 fb0b9197410..a6062614677 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -58,7 +58,7 @@ "description": "vk/util: fix buggy usage of unreachable()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": 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)