Module: Mesa Branch: staging/23.0 Commit: 4e7d97e462fc66c6cd3619ddb049580b25f093e8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e7d97e462fc66c6cd3619ddb049580b25f093e8
Author: Eric Engestrom <[email protected]> Date: Mon Apr 17 13:01:27 2023 +0100 pvr: 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 2f9520a5d0e6f49ee42bf2e8c327b7fcde669f87) --- .pick_status.json | 2 +- src/imagination/vulkan/pvr_cmd_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1edc54361ab..d5d44238d6f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2534,7 +2534,7 @@ "description": "pvr: 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/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c index 52644672d60..97fca043888 100644 --- a/src/imagination/vulkan/pvr_cmd_buffer.c +++ b/src/imagination/vulkan/pvr_cmd_buffer.c @@ -4851,7 +4851,7 @@ static void pvr_emit_dirty_vdm_state(struct pvr_cmd_buffer *const cmd_buffer, break; default: - unreachable(!"Invalid index type"); + unreachable("Invalid index type"); } } }
