From 71dfcd3c967dc29585d9c4ab9652915a92662cb5 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Fri, 5 Dec 2025 15:33:15 -0800 Subject: [PATCH] zink: Fix 64-bit bitmask usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/zink/zink_screen.c | 2 +- src/gallium/drivers/zink/zink_surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 4481cd7789b..339b1035a46 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2204,7 +2204,7 @@ retry: } } if (zink_format_is_emulated_alpha(pformat)) { - VkFormatFeatureFlags blocked = VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT; + VkFormatFeatureFlags2 blocked = VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT; screen->format_props[pformat].linearTilingFeatures &= ~blocked; screen->format_props[pformat].optimalTilingFeatures &= ~blocked; screen->format_props[pformat].bufferFeatures = 0; diff --git a/src/gallium/drivers/zink/zink_surface.c b/src/gallium/drivers/zink/zink_surface.c index 415af721e19..b7437681759 100644 --- a/src/gallium/drivers/zink/zink_surface.c +++ b/src/gallium/drivers/zink/zink_surface.c @@ -112,7 +112,7 @@ apply_view_usage_for_format(struct zink_screen *screen, struct pipe_resource *pr VkFormatFeatureFlags feats = res->linear ? zink_get_format_props(screen, format)->linearTilingFeatures : zink_get_format_props(screen, format)->optimalTilingFeatures; - VkImageUsageFlags attachment = (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT); + uint64_t attachment = (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT); usage_info->usage = res->obj->vkusage & ~attachment; if (res->obj->modifier_aspect) { feats = res->obj->vkfeats;