Skip to content

Fix Device::availableMemory crash on Vulkan 1.0 instances #1712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbait wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −10
Open

Fix Device::availableMemory crash on Vulkan 1.0 instances #1712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions src/vsg/vk/Device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,17 +208,30 @@ 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;
// vkGetPhysicalDeviceMemoryProperties2 requires Vulkan 1.1, and the chained
// VkPhysicalDeviceMemoryBudgetPropertiesEXT additionally requires VK_EXT_memory_budget.
// Fall back to the 1.0 query (no live budget tracking) when either is missing.
const bool useBudget = supportsApiVersion(VK_API_VERSION_1_1) &&
supportsDeviceExtension(VK_EXT_MEMORY_BUDGET_EXTENSION_NAME);

VkPhysicalDeviceMemoryProperties2 dmp;
dmp.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2;
dmp.pNext = &memoryBudget;
VkPhysicalDeviceMemoryProperties memoryProperties;
VkPhysicalDeviceMemoryBudgetPropertiesEXT memoryBudget = {};

vkGetPhysicalDeviceMemoryProperties2(*(getPhysicalDevice()), &dmp);
if (useBudget)
{
memoryBudget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;

VkPhysicalDeviceMemoryProperties2 dmp = {};
dmp.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2;
dmp.pNext = &memoryBudget;

auto& memoryProperties = dmp.memoryProperties;
vkGetPhysicalDeviceMemoryProperties2(*(getPhysicalDevice()), &dmp);
memoryProperties = dmp.memoryProperties;
}
else
{
vkGetPhysicalDeviceMemoryProperties(*(getPhysicalDevice()), &memoryProperties);
}

VkDeviceSize availableSpace = 0;
for (uint32_t i = 0; i < memoryProperties.memoryTypeCount; ++i)
Expand All @@ -227,8 +240,10 @@ VkDeviceSize Device::availableMemory(VkMemoryPropertyFlags memoryPropertiesFlags
{
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 heapBudget = useBudget ? memoryBudget.heapBudget[heapIndex] : memoryProperties.memoryHeaps[heapIndex].size;
VkDeviceSize heapUsage = useBudget ? memoryBudget.heapUsage[heapIndex] : 0;

heapBudget = static_cast<VkDeviceSize>(static_cast<double>(heapBudget) * allocatedMemoryLimit);
VkDeviceSize heapAvailable = (heapUsage < heapBudget) ? heapBudget - heapUsage : 0;
availableSpace += heapAvailable;

Expand Down