summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Engestrom <eric@igalia.com>2023-04-17 13:01:41 +0100
committerEric Engestrom <eric@engestrom.ch>2023-04-19 14:37:57 +0100
commit9d8fdeb296d43c5b533ab320690be10a0c656d2e (patch)
tree5461d40ed3e490052d00c6919b5e3f5bb2263dfb
parentc90c223c980ae8f16bae3a2b9355c50e912c4169 (diff)
downloadmesa-9d8fdeb296d43c5b533ab320690be10a0c656d2e.tar.gz
vk/util: fix buggy usage of unreachable()
Cc: mesa-stable Signed-off-by: Eric Engestrom <eric@igalia.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22529> (cherry picked from commit 5863bafbdc9b0b5118bd8b2e5bbbe47d5d3ab21a)
-rw-r--r--.pick_status.json2
-rw-r--r--src/vulkan/util/vk_dispatch_table_gen.py2
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)