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
+27 −10
Open

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

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions include/vsg/vk/Device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ namespace vsg
/// return true if Device was created with specified extension
bool supportsDeviceExtension(const char* extensionName) const;

/// commonly checked extensions cached at construction
const bool memory_budget = false; // VK_EXT_memory_budget usable on this Device

/// return the amount of remaining memory, compatible with specified flags, available that can be allocated.
VkDeviceSize availableMemory(VkMemoryPropertyFlags memoryPropertiesFlags, double allocatedMemoryLimit = 1.0) const;

Expand Down
34 changes: 24 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 @@ -163,6 +163,11 @@ Device::Device(PhysicalDevice* physicalDevice, const QueueSettings& queueSetting
}

_extensions = DeviceExtensions::create(this);

// Cache extension/version probes used on hot paths. VK_EXT_memory_budget piggy-backs on
// vkGetPhysicalDeviceMemoryProperties2 which requires Vulkan 1.1 (or the KHR variant).
const_cast<bool&>(memory_budget) = supportsApiVersion(VK_API_VERSION_1_1) &&
supportsDeviceExtension(VK_EXT_MEMORY_BUDGET_EXTENSION_NAME);
}

Device::~Device()
Expand Down Expand Up @@ -208,17 +213,24 @@ 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;
VkPhysicalDeviceMemoryProperties memoryProperties;
VkPhysicalDeviceMemoryBudgetPropertiesEXT memoryBudget = {};

VkPhysicalDeviceMemoryProperties2 dmp;
dmp.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2;
dmp.pNext = &memoryBudget;
if (memory_budget)
{
memoryBudget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;

vkGetPhysicalDeviceMemoryProperties2(*(getPhysicalDevice()), &dmp);
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 +239,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 = memory_budget ? memoryBudget.heapBudget[heapIndex] : memoryProperties.memoryHeaps[heapIndex].size;
VkDeviceSize heapUsage = memory_budget ? memoryBudget.heapUsage[heapIndex] : 0;

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

Expand Down