mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dxvk] Rename memoryAvailable -> memoryBudget

This commit is contained in:
Philip Rebohle 2019-07-13 19:04:33 +02:00
parent fac3ae9f83
commit e116ff49e6
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dxgi/dxgi_adapter.cpp
View File

@ -248,7 +248,7 @@ namespace dxvk {
if ((memInfo.heaps[i].heapFlags & heapFlagMask) != heapFlags)
continue;
pVideoMemoryInfo->Budget += memInfo.heaps[i].memoryAvailable;
pVideoMemoryInfo->Budget += memInfo.heaps[i].memoryBudget;
pVideoMemoryInfo->CurrentUsage += memInfo.heaps[i].memoryAllocated;
}

4
src/dxvk/dxvk_adapter.cpp
View File

@ -51,10 +51,10 @@ namespace dxvk {
info.heaps[i].heapFlags = memProps.memoryProperties.memoryHeaps[i].flags;
if (m_hasMemoryBudget) {
info.heaps[i].memoryAvailable = memBudget.heapBudget[i];
info.heaps[i].memoryBudget = memBudget.heapBudget[i];
info.heaps[i].memoryAllocated = memBudget.heapUsage[i];
} else {
info.heaps[i].memoryAvailable = memProps.memoryProperties.memoryHeaps[i].size;
info.heaps[i].memoryBudget = memProps.memoryProperties.memoryHeaps[i].size;
info.heaps[i].memoryAllocated = m_heapAlloc[i].load();
}
}

2
src/dxvk/dxvk_adapter.h
View File

@ -27,7 +27,7 @@ namespace dxvk {
*/
struct DxvkAdapterMemoryHeapInfo {
VkMemoryHeapFlags heapFlags;
VkDeviceSize memoryAvailable;
VkDeviceSize memoryBudget;
VkDeviceSize memoryAllocated;
};

2
src/dxvk/dxvk_memory.cpp
View File

@ -221,7 +221,7 @@ namespace dxvk {
m_device->extensions().extMemoryBudget
? str::format(
(memHeapInfo.heaps[i].memoryAllocated >> 20), " MB allocated (driver), ",
(memHeapInfo.heaps[i].memoryAvailable >> 20), " MB available (driver), ",
(memHeapInfo.heaps[i].memoryBudget >> 20), " MB budget (driver), ",
(m_memHeaps[i].properties.size >> 20), " MB total")
: str::format(
(m_memHeaps[i].properties.size >> 20), " MB total")));