From fd3fbf66070e85bca8e7261577ea411e2bd620c7 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 6 Mar 2024 15:33:48 +0100 Subject: [PATCH] [dxvk] Remove old memory budget code Obsolete since we removed the Nvidia HVV workaround for old drivers. Closes #3877. --- src/dxvk/dxvk_memory.cpp | 10 +--------- src/dxvk/dxvk_memory.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/dxvk/dxvk_memory.cpp b/src/dxvk/dxvk_memory.cpp index 0105bca8..e516e358 100644 --- a/src/dxvk/dxvk_memory.cpp +++ b/src/dxvk/dxvk_memory.cpp @@ -188,7 +188,6 @@ namespace dxvk { for (uint32_t i = 0; i < m_memProps.memoryHeapCount; i++) { m_memHeaps[i].properties = m_memProps.memoryHeaps[i]; m_memHeaps[i].stats = DxvkMemoryStats { 0, 0 }; - m_memHeaps[i].budget = 0; } for (uint32_t i = 0; i < m_memProps.memoryTypeCount; i++) { @@ -385,9 +384,6 @@ namespace dxvk { bool useMemoryPriority = (info.flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) && (m_device->features().extMemoryPriority.memoryPriority); - if (type->heap->budget && type->heap->stats.memoryAllocated + size > type->heap->budget) - return DxvkDeviceMemory(); - float priority = 0.0f; if (hints.test(DxvkMemoryFlag::GpuReadable)) @@ -547,11 +543,7 @@ namespace dxvk { bool DxvkMemoryAllocator::shouldFreeEmptyChunks( const DxvkMemoryHeap* heap, VkDeviceSize allocationSize) const { - VkDeviceSize budget = heap->budget; - - if (!budget) - budget = (heap->properties.size * 4) / 5; - + VkDeviceSize budget = (heap->properties.size * 4) / 5; return heap->stats.memoryAllocated + allocationSize > budget; } diff --git a/src/dxvk/dxvk_memory.h b/src/dxvk/dxvk_memory.h index 14dadd5f..26ae85f4 100644 --- a/src/dxvk/dxvk_memory.h +++ b/src/dxvk/dxvk_memory.h @@ -66,7 +66,6 @@ namespace dxvk { struct DxvkMemoryHeap { VkMemoryHeap properties; DxvkMemoryStats stats; - VkDeviceSize budget; };