From edeb3fec4dc7c2d1593501521161597d1006cd01 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 29 Mar 2024 08:28:25 -0400 Subject: [PATCH] zink: only check that CUBE_COMPATIBLE for images doesn't subtract flags the flags may change if e.g., HOST_TRANSFER is enabled by adding CUBE fixes #10924 cc: mesa-stable Part-of: --- src/gallium/drivers/zink/zink_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index dbe7bf76c70..16b3b0413c6 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -672,7 +672,7 @@ retry: } if (want_cube) { ici->flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; - if (get_image_usage(screen, ici, templ, bind, modifiers_count, modifiers, &mod) != ici->usage) + if ((get_image_usage(screen, ici, templ, bind, modifiers_count, modifiers, &mod) & ici->usage) != ici->usage) ici->flags &= ~VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; }