Merge pull request #1713 from vsg-dev/availableMemory_checks

Available memory checks

Author: robertosfield

include/vsg/vk/DeviceExtensions.h

@@ -61,6 +61,9 @@ namespace vsg
         PFN_vkCmdSetDepthBoundsTestEnableEXT vkCmdSetDepthBoundsTestEnable = nullptr;
         PFN_vkCmdSetStencilTestEnableEXT vkCmdSetStencilTestEnable = nullptr;
         PFN_vkCmdSetStencilOpEXT vkCmdSetStencilOp = nullptr;
+
+        // cache whether extension is supported
+        bool memory_budget = false; // VK_EXT_memory_budget
     };
     VSG_type_name(vsg::DeviceExtensions);
 

src/vsg/vk/Device.cpp

@@ -53,7 +53,6 @@ static void releaseDeviceID(uint32_t deviceID)
 
 Device::Device(PhysicalDevice* physicalDevice, const QueueSettings& queueSettings, Names layers, Names deviceExtensions, const DeviceFeatures* deviceFeatures, AllocationCallbacks* allocator) :
     deviceID(getUniqueDeviceID()),
-    enabledExtensions(deviceExtensions),
     _instance(physicalDevice->getInstance()),
     _physicalDevice(physicalDevice),
     _allocator(allocator)
@@ -115,6 +114,11 @@ Device::Device(PhysicalDevice* physicalDevice, const QueueSettings& queueSetting
         deviceExtensions.push_back(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME);
 #endif
 
+    if (supportsApiVersion(VK_API_VERSION_1_1) && _physicalDevice->supportsDeviceExtension(VK_EXT_MEMORY_BUDGET_EXTENSION_NAME))
+    {
+        deviceExtensions.push_back(VK_EXT_MEMORY_BUDGET_EXTENSION_NAME);
+    }
+
     VkDeviceCreateInfo createInfo = {};
     createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
 
@@ -162,6 +166,7 @@ Device::Device(PhysicalDevice* physicalDevice, const QueueSettings& queueSetting
         }
     }
 
+    const_cast<Names&>(enabledExtensions) = deviceExtensions;
     _extensions = DeviceExtensions::create(this);
 }
 
@@ -208,32 +213,59 @@ bool Device::supportsDeviceExtension(const char* extensionName) const
 
 VkDeviceSize Device::availableMemory(VkMemoryPropertyFlags memoryPropertiesFlags, double allocatedMemoryLimit) const
 {
-    VkPhysicalDeviceMemoryBudgetPropertiesEXT memoryBudget;
-    memoryBudget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;
-    memoryBudget.pNext = nullptr;
+    if (_extensions->memory_budget)
+    {
+        VkPhysicalDeviceMemoryBudgetPropertiesEXT memoryBudget;
+        memoryBudget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;
+        memoryBudget.pNext = nullptr;
 
-    VkPhysicalDeviceMemoryProperties2 dmp;
-    dmp.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2;
-    dmp.pNext = &memoryBudget;
+        VkPhysicalDeviceMemoryProperties2 dmp;
+        dmp.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2;
+        dmp.pNext = &memoryBudget;
 
-    vkGetPhysicalDeviceMemoryProperties2(*(getPhysicalDevice()), &dmp);
+        vkGetPhysicalDeviceMemoryProperties2(*(getPhysicalDevice()), &dmp);
 
-    auto& memoryProperties = dmp.memoryProperties;
+        auto& memoryProperties = dmp.memoryProperties;
 
-    VkDeviceSize availableSpace = 0;
-    for (uint32_t i = 0; i < memoryProperties.memoryTypeCount; ++i)
+        VkDeviceSize availableSpace = 0;
+        for (uint32_t i = 0; i < memoryProperties.memoryTypeCount; ++i)
+        {
+            if ((memoryProperties.memoryTypes[i].propertyFlags & memoryPropertiesFlags) == memoryPropertiesFlags) // supported
+            {
+                uint32_t heapIndex = memoryProperties.memoryTypes[i].heapIndex;
+
+                VkDeviceSize heapBudget = static_cast<VkDeviceSize>(static_cast<double>(memoryBudget.heapBudget[heapIndex]) * allocatedMemoryLimit);
+                VkDeviceSize heapUsage = memoryBudget.heapUsage[heapIndex];
+                VkDeviceSize heapAvailable = (heapUsage < heapBudget) ? heapBudget - heapUsage : 0;
+                availableSpace += heapAvailable;
+
+                break;
+            }
+        }
+
+        return availableSpace;
+    }
+    else
     {
-        if ((memoryProperties.memoryTypes[i].propertyFlags & memoryPropertiesFlags) == memoryPropertiesFlags) // supported
+        VkPhysicalDeviceMemoryProperties memoryProperties;
+        vkGetPhysicalDeviceMemoryProperties(*(getPhysicalDevice()), &memoryProperties);
+
+        VkDeviceSize availableSpace = 0;
+        for (uint32_t i = 0; i < memoryProperties.memoryTypeCount; ++i)
         {
-            uint32_t heapIndex = memoryProperties.memoryTypes[i].heapIndex;
+            if ((memoryProperties.memoryTypes[i].propertyFlags & memoryPropertiesFlags) == memoryPropertiesFlags) // supported
+            {
+                uint32_t heapIndex = memoryProperties.memoryTypes[i].heapIndex;
+
+                VkDeviceSize heapBudget = static_cast<VkDeviceSize>(static_cast<double>(memoryProperties.memoryHeaps[heapIndex].size) * allocatedMemoryLimit);;
 
-            VkDeviceSize heapBudget = static_cast<VkDeviceSize>(static_cast<double>(memoryBudget.heapBudget[heapIndex]) * allocatedMemoryLimit);
-            VkDeviceSize heapUsage = memoryBudget.heapUsage[heapIndex];
-            VkDeviceSize heapAvailable = (heapUsage < heapBudget) ? heapBudget - heapUsage : 0;
-            availableSpace += heapAvailable;
+                // unable to estimate usage, so assume whole budget is available and let calling code gracefully handle any memory allocation failures.
+                availableSpace += heapBudget;
 
-            break;
+                break;
+            }
         }
+
+        return availableSpace;
     }
-    return availableSpace;
 }

src/vsg/vk/DeviceExtensions.cpp

@@ -77,4 +77,6 @@ DeviceExtensions::DeviceExtensions(Device* device)
         device->getProcAddr(vkCmdSetStencilTestEnable, "vkCmdSetStencilTestEnableEXT");
         device->getProcAddr(vkCmdSetStencilOp, "vkCmdSetStencilOpEXT");
     }
+
+    memory_budget = device->supportsApiVersion(VK_API_VERSION_1_1) && device->supportsDeviceExtension(VK_EXT_MEMORY_BUDGET_EXTENSION_NAME);
 }