From e116ff49e6976f584256bc57d9c8f3ccf53c5796 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sat, 13 Jul 2019 19:04:33 +0200 Subject: [PATCH] [dxvk] Rename memoryAvailable -> memoryBudget --- src/dxgi/dxgi_adapter.cpp | 2 +- src/dxvk/dxvk_adapter.cpp | 4 ++-- src/dxvk/dxvk_adapter.h | 2 +- src/dxvk/dxvk_memory.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dxgi/dxgi_adapter.cpp b/src/dxgi/dxgi_adapter.cpp index e7e574603..fa92bccda 100644 --- a/src/dxgi/dxgi_adapter.cpp +++ b/src/dxgi/dxgi_adapter.cpp @@ -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; } diff --git a/src/dxvk/dxvk_adapter.cpp b/src/dxvk/dxvk_adapter.cpp index 48364df02..4e0274734 100644 --- a/src/dxvk/dxvk_adapter.cpp +++ b/src/dxvk/dxvk_adapter.cpp @@ -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(); } } diff --git a/src/dxvk/dxvk_adapter.h b/src/dxvk/dxvk_adapter.h index 15af2471a..efd2b9ca3 100644 --- a/src/dxvk/dxvk_adapter.h +++ b/src/dxvk/dxvk_adapter.h @@ -27,7 +27,7 @@ namespace dxvk { */ struct DxvkAdapterMemoryHeapInfo { VkMemoryHeapFlags heapFlags; - VkDeviceSize memoryAvailable; + VkDeviceSize memoryBudget; VkDeviceSize memoryAllocated; }; diff --git a/src/dxvk/dxvk_memory.cpp b/src/dxvk/dxvk_memory.cpp index 33e68fcc3..9a8cec3d9 100644 --- a/src/dxvk/dxvk_memory.cpp +++ b/src/dxvk/dxvk_memory.cpp @@ -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")));