diff --git a/.pick_status.json b/.pick_status.json index 0d8176c0dc9..e3884fad7b7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -704,7 +704,7 @@ "description": "zink: relax build-id length assertion for Mach-O", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index e56ecb7a7c0..9084c911b38 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -318,7 +318,7 @@ disk_cache_init(struct zink_screen *screen) const struct build_id_note *note = build_id_find_nhdr_for_addr(disk_cache_init); unsigned build_id_len = build_id_length(note); - assert(note && build_id_len == BUILD_ID_EXPECTED_HASH_LENGTH); + assert(note && build_id_len <= BUILD_ID_EXPECTED_HASH_LENGTH); _mesa_blake3_update(&ctx, build_id_data(note), build_id_len); #endif