From 08d4bbaa91c7f42fd99a8ec49575a686612e094d Mon Sep 17 00:00:00 2001 From: MaxLastBreath Date: Sat, 14 Sep 2024 18:54:58 +0300 Subject: [PATCH] Add DefaultTextureSizeCapacity and MemoryScaleFactor - Also remove redundant New Lines --- src/Ryujinx.Graphics.Gpu/Image/AutoDeleteCache.cs | 14 +++++++------- src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Ryujinx.Graphics.Gpu/Image/AutoDeleteCache.cs b/src/Ryujinx.Graphics.Gpu/Image/AutoDeleteCache.cs index ffa1da2ffc..e9477e469b 100644 --- a/src/Ryujinx.Graphics.Gpu/Image/AutoDeleteCache.cs +++ b/src/Ryujinx.Graphics.Gpu/Image/AutoDeleteCache.cs @@ -47,6 +47,8 @@ namespace Ryujinx.Graphics.Gpu.Image { private const int MinCountForDeletion = 32; private const int MaxCapacity = 2048; + private const ulong DefaultTextureSizeCapacity = 1024 * 1024 * 1024; + private const float MemoryScaleFactor = 0.50f; private readonly LinkedList _textures; private ulong _totalSize; @@ -63,16 +65,14 @@ namespace Ryujinx.Graphics.Gpu.Image /// private ulong GetMaxTextureCapacity() { - Capabilities capabilities = _context.Capabilities; + ulong maxMemory = _context.Capabilities.MaximumGpuMemory; - if (capabilities.MaximumGpuMemory <= 0) + if (maxMemory > 0) { - return 1024L * 1024 * 1024; - } - else - { - return (ulong)(capabilities.MaximumGpuMemory * 0.50); + return (ulong)(maxMemory * MemoryScaleFactor); } + + return DefaultTextureSizeCapacity; } /// diff --git a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs b/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs index 476973742a..6d0b860f94 100644 --- a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs +++ b/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs @@ -787,10 +787,8 @@ namespace Ryujinx.Graphics.Vulkan public ulong GetTotalGPUMemory() { - ulong totalMemory = 0; - Api.GetPhysicalDeviceMemoryProperties(_physicalDevice.PhysicalDevice, out PhysicalDeviceMemoryProperties memoryProperties); for (int i = 0; i < memoryProperties.MemoryHeapCount; i++)