Vulkan: enable host image copy if supported, but only initialize textures on UMA

Author: TheMostDiligent

Graphics/GraphicsEngine/include/RenderDeviceBase.hpp

@@ -73,8 +73,7 @@ DeviceFeatures EnableDeviceFeatures(const DeviceFeatures& SupportedFeatures,
                                     const DeviceFeatures& RequestedFeatures) noexcept(false);
 
 DeviceFeaturesVk EnableDeviceFeaturesVk(const DeviceFeaturesVk& SupportedFeatures,
-                                        const DeviceFeaturesVk& RequestedFeatures,
-                                        bool                    IsUMA) noexcept(false);
+                                        const DeviceFeaturesVk& RequestedFeatures) noexcept(false);
 
 /// Checks sparse texture format support and returns the component type
 COMPONENT_TYPE CheckSparseTextureFormatSupport(TEXTURE_FORMAT                  TexFormat,

Graphics/GraphicsEngine/src/RenderDeviceBase.cpp

@@ -128,23 +128,12 @@ DeviceFeatures EnableDeviceFeatures(const DeviceFeatures& SupportedFeatures,
 }
 
 DeviceFeaturesVk EnableDeviceFeaturesVk(const DeviceFeaturesVk& SupportedFeatures,
-                                        const DeviceFeaturesVk& RequestedFeatures,
-                                        bool                    IsUMA) noexcept(false)
+                                        const DeviceFeaturesVk& RequestedFeatures) noexcept(false)
 {
     DeviceFeaturesVk EnabledFeatures;
 
     ENABLE_FEATURE(DynamicRendering, "VK_KHR_dynamic_rendering is");
-    if (RequestedFeatures.HostImageCopy == DEVICE_FEATURE_STATE_OPTIONAL && SupportedFeatures.HostImageCopy != DEVICE_FEATURE_STATE_DISABLED)
-    {
-        // Only enable VK_EXT_host_image_copy if the device is UMA.
-        // On discrete GPUs, textures with VK_IMAGE_USAGE_HOST_TRANSFER_BIT usage are allocated in a host-visible
-        // device local memory that is very scarce.
-        EnabledFeatures.HostImageCopy = IsUMA ? DEVICE_FEATURE_STATE_ENABLED : DEVICE_FEATURE_STATE_DISABLED;
-    }
-    else
-    {
-        ENABLE_FEATURE(HostImageCopy, "VK_EXT_host_image_copy is");
-    }
+    ENABLE_FEATURE(HostImageCopy, "VK_EXT_host_image_copy is");
 
     ASSERT_SIZEOF(DeviceFeaturesVk, 2, "Did you add a new feature to DeviceFeaturesVk? Please handle its status here (if necessary).");
 

Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp

@@ -754,7 +754,7 @@ void EngineFactoryVkImpl::CreateDeviceAndContextsVk(const EngineVkCreateInfo& En
         VerifyEngineCreateInfo(EngineCI, AdapterInfo);
         const DeviceFeatures   EnabledFeatures   = EnableDeviceFeatures(AdapterInfo.Features, EngineCI.Features);
         const DeviceFeaturesVk AdapterFeaturesVk = PhysicalDeviceFeaturesToDeviceFeaturesVk(PhysicalDevice->GetExtFeatures(), DEVICE_FEATURE_STATE_OPTIONAL);
-        const DeviceFeaturesVk EnabledFeaturesVk = EnableDeviceFeaturesVk(AdapterFeaturesVk, EngineCI.FeaturesVk, PhysicalDevice->IsUMA());
+        const DeviceFeaturesVk EnabledFeaturesVk = EnableDeviceFeaturesVk(AdapterFeaturesVk, EngineCI.FeaturesVk);
 
         std::vector<VkDeviceQueueGlobalPriorityCreateInfoEXT> QueueGlobalPriority;
         std::vector<VkDeviceQueueCreateInfo>                  QueueInfos;

Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp

@@ -170,13 +170,20 @@ VkImageLayout VkImageLayoutFromUsage(VkImageUsageFlags Usage)
     return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
 }
 
-bool CheckHostImageCopySupport(const VulkanUtilities::VulkanLogicalDevice&  LogicalDevice,
-                               const VulkanUtilities::VulkanPhysicalDevice& PhysicalDevice,
-                               const VkImageCreateInfo&                     ImageCI)
+bool CheckHostImageInitialization(const VulkanUtilities::VulkanLogicalDevice&  LogicalDevice,
+                                  const VulkanUtilities::VulkanPhysicalDevice& PhysicalDevice,
+                                  const VkImageCreateInfo&                     ImageCI)
 {
     if (!LogicalDevice.GetEnabledExtFeatures().HostImageCopy.hostImageCopy)
         return false;
 
+    if (!PhysicalDevice.IsUMA())
+    {
+        // On discrete GPUs, textures with VK_IMAGE_USAGE_HOST_TRANSFER_BIT usage are allocated in a host-visible
+        // device-local memory that is very scarce.
+        return false;
+    }
+
     VkFormatProperties3 vkFormatProps3{};
     VkFormatProperties  VkFormatProps = PhysicalDevice.GetPhysicalDeviceFormatProperties(ImageCI.format, &vkFormatProps3);
     (void)VkFormatProps;
@@ -236,9 +243,9 @@ TextureVkImpl::TextureVkImpl(IReferenceCounters*        pRefCounters,
 
         VkImageCreateInfo ImageCI = TextureDescToVkImageCreateInfo(m_Desc, pRenderDeviceVk);
 
-        const bool InitContent      = pInitData != nullptr && pInitData->pSubResources != nullptr && pInitData->NumSubresources > 0;
-        const bool UseHostImageCopy = InitContent && CheckHostImageCopySupport(LogicalDevice, pRenderDeviceVk->GetPhysicalDevice(), ImageCI);
-        if (UseHostImageCopy)
+        const bool InitContent           = pInitData != nullptr && pInitData->pSubResources != nullptr && pInitData->NumSubresources > 0;
+        const bool UseHostInitialization = InitContent && CheckHostImageInitialization(LogicalDevice, pRenderDeviceVk->GetPhysicalDevice(), ImageCI);
+        if (UseHostInitialization)
             ImageCI.usage |= VK_IMAGE_USAGE_HOST_TRANSFER_BIT;
 
         const std::vector<uint32_t> QueueFamilyIndices = PlatformMisc::CountOneBits(m_Desc.ImmediateContextMask) > 1 ?
@@ -288,7 +295,7 @@ TextureVkImpl::TextureVkImpl(IReferenceCounters*        pRefCounters,
             if (InitContent)
             {
                 bool InitializedOnHost = false;
-                if (UseHostImageCopy)
+                if (UseHostInitialization)
                 {
                     InitializedOnHost = InitializeContentOnHost(*pInitData, FmtAttribs, ImageCI);
                 }