zink: Fix 64-bit bitmask usage

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38838>
This commit is contained in:
Jesse Natalie 2025-12-05 15:33:15 -08:00 committed by Marge Bot
parent dacc56ee53
commit 71dfcd3c96
2 changed files with 2 additions and 2 deletions

View file

@ -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;

View file

@ -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;