diff --git a/.pick_status.json b/.pick_status.json index e1472ea1c56..14858564862 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -244,7 +244,7 @@ "description": "panvk: Fix assertion in is_disjoint()", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "412c28633152e1f86a2e7e0932542588bfa87e6c", "notes": null diff --git a/src/panfrost/vulkan/panvk_image.c b/src/panfrost/vulkan/panvk_image.c index 37d06f5cdc5..d7e4be953ab 100644 --- a/src/panfrost/vulkan/panvk_image.c +++ b/src/panfrost/vulkan/panvk_image.c @@ -316,6 +316,7 @@ is_disjoint(struct panvk_image *image) { assert((image->plane_count > 1 && image->vk.format != VK_FORMAT_D32_SFLOAT_S8_UINT) || + (image->vk.create_flags & VK_IMAGE_CREATE_ALIAS_BIT) || !(image->vk.create_flags & VK_IMAGE_CREATE_DISJOINT_BIT)); return image->vk.create_flags & VK_IMAGE_CREATE_DISJOINT_BIT; }