venus: fix a prime blit assert...again
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

The assert doesn't consider multiple queue family case where the same
blit cmd has to be recorded for each, thus hitting the assert for the
same image and buffer.

The prior fix of the same 054c8e117e was
accidentally missed in the reland of the implicit in-fence handling MR:
- https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39401

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14843
Fixes: eb709cba47 ("venus: track prime blit dst buffer memory in the wsi image")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39871>
This commit is contained in:
Yiwei Zhang 2025-07-07 10:26:50 -07:00 committed by Marge Bot
parent 7f469f1963
commit 04494efa7c

View file

@ -1488,7 +1488,7 @@ vn_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer,
*/
if (buf->wsi.mem) {
assert(img->wsi.is_prime_blit_src);
assert(!img->wsi.blit_mem);
assert(!img->wsi.blit_mem || img->wsi.blit_mem == buf->wsi.mem);
img->wsi.blit_mem = buf->wsi.mem;
}