niansa-misc/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-06 20:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

[dxvk] Fix memory type selection for non-device local property flags

Browse source 
Fixes potential memory allocation issues on unified memory setups
that have unique memory types for different resources.
This commit is contained in:
Philip Rebohle 2025-02-24 17:44:08 +01:00 • committed by Philip Rebohle
parent 60bf1f9ec4
commit 866228a37d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/dxvk/dxvk_memory.cpp
View file

@ -1911,7 +1911,9 @@ namespace dxvk {
// flags. This lets us avoid iterating over unsupported memory types // flags. This lets us avoid iterating over unsupported memory types
for (uint32_t i = 0; i < m_memTypesByPropertyFlags.size(); i++) { for (uint32_t i = 0; i < m_memTypesByPropertyFlags.size(); i++) {
VkMemoryPropertyFlags flags = VkMemoryPropertyFlags(i); VkMemoryPropertyFlags flags = VkMemoryPropertyFlags(i);
uint32_t mask = 0u;
uint32_t vidmemMask = 0u;
uint32_t sysmemMask = 0u;
for (uint32_t j = 0; j < m_memTypeCount; j++) { for (uint32_t j = 0; j < m_memTypeCount; j++) {
VkMemoryPropertyFlags typeFlags = m_memTypes[j].properties.propertyFlags; VkMemoryPropertyFlags typeFlags = m_memTypes[j].properties.propertyFlags;
@ -1919,16 +1921,16 @@ namespace dxvk {
if ((typeFlags & flags) != flags) if ((typeFlags & flags) != flags)
continue; continue;
// Do not include device-local memory types if a non-device if (typeFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)
// local one exists with the same required propery flags. vidmemMask |= 1u << j;
if (mask && !(flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) else
&& (typeFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) sysmemMask |= 1u << j;
continue;
mask |= 1u << j;
} }
m_memTypesByPropertyFlags[i] = mask; // If a system memory type exists with the given properties, do not
// include any device-local memory types. This way we won't ever pick
// host-visible vram when explicitly trying to allocate system memory.
m_memTypesByPropertyFlags[i] = sysmemMask ? sysmemMask : vidmemMask;
} }
// If there is no cached coherent memory type, reuse the uncached // If there is no cached coherent memory type, reuse the uncached