From 415c78b87c008f0d963679ea9bc06c8aa566b506 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 20 May 2023 17:15:36 -0400 Subject: textures: add BC1 and BC3 compressors and recompression setting --- src/video_core/vulkan_common/vulkan_device.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/video_core/vulkan_common') diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index f6e6f2736..b49f78bc9 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -1001,6 +1001,11 @@ u64 Device::GetDeviceMemoryUsage() const { } void Device::CollectPhysicalMemoryInfo() { + // Account for resolution scaling in memory limits + const size_t normal_memory = 6_GiB; + const size_t scaler_memory = 1_GiB * Settings::values.resolution_info.ScaleUp(1); + + // Calculate limits using memory budget VkPhysicalDeviceMemoryBudgetPropertiesEXT budget{}; budget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT; const auto mem_info = @@ -1030,6 +1035,7 @@ void Device::CollectPhysicalMemoryInfo() { if (!is_integrated) { const u64 reserve_memory = std::min(device_access_memory / 8, 1_GiB); device_access_memory -= reserve_memory; + device_access_memory = std::min(device_access_memory, normal_memory + scaler_memory); return; } const s64 available_memory = static_cast(device_access_memory - device_initial_usage); -- cgit v1.2.3