From baeb070a941ffb56aa070f38a504fe11f8351452 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Sat, 23 Aug 2025 11:11:23 -0400 Subject: [PATCH] nvk: Stop adding Vulkan image usage flags The sampled and color attachment bits don't actually affect image layout in any meaningful way. They just cause us to create extra descriptors in cases where we may not need them. However, now that meta always sets view usage, we always create the usages meta needs, even if the client doesn't request them. Part-of: --- src/nouveau/vulkan/nvk_image.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index f2e01ea3c0e..b38f374d110 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -768,18 +768,6 @@ nvk_image_init(struct nvk_device *dev, vk_image_init(&dev->vk, &image->vk, pCreateInfo); - if ((image->vk.usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | - VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) && - image->vk.samples > 1) { - image->vk.usage |= VK_IMAGE_USAGE_SAMPLED_BIT; - image->vk.stencil_usage |= VK_IMAGE_USAGE_SAMPLED_BIT; - } - - if (image->vk.usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) - image->vk.usage |= VK_IMAGE_USAGE_SAMPLED_BIT; - if (image->vk.usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT) - image->vk.usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; - nil_image_usage_flags usage = 0; if (image->vk.tiling == VK_IMAGE_TILING_LINEAR) usage |= NIL_IMAGE_USAGE_LINEAR_BIT;