RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-06 06:55:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

rsx/vk: Try to reclaim memory aggressively when changing resolution scale
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.9, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.9, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.9, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.9, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (0, 51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, Intel) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (1, 8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, Apple Silicon) (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang ${{ matrix.arch }} (aarch64, clang, clangarm64, ARM64, windows-11-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang ${{ matrix.arch }} (x86_64, clang, clang64, X64, windows-2025) (push) Waiting to run
Build RPCS3 / RPCS3 FreeBSD (push) Waiting to run

Browse source
This commit is contained in:
kd-11 2026-03-28 19:33:35 +03:00 • committed by kd-11
parent 069821a2e7
commit 51ea735cb5
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/RSX/Common/surface_store.h
View file

@ -1523,8 +1523,12 @@ namespace rsx
allocate_rsx_memory(Traits::get(sink));
// Replace with the new one
ensure(copy.target == Traits::get(sink));
auto new_surface = Traits::get(sink);
ensure(copy.target == new_surface);
data.emplace(surface->get_memory_range(), std::move(sink));
// Force barrier to reduce VRAM pressure
new_surface->memory_barrier(cmd, rsx::surface_access::memory_read);
}
};

16
rpcs3/Emu/RSX/VK/VKPresent.cpp
View file

@ -1,6 +1,7 @@
#include "stdafx.h"
#include "VKGSRender.h"
#include "vkutils/buffer_object.h"
#include "vkutils/memory.h"
#include "Emu/RSX/Overlays/overlay_manager.h"
#include "Emu/RSX/Overlays/overlay_debug_overlay.h"
#include "Emu/Cell/Modules/cellVideoOut.h"
@ -973,7 +974,22 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
if (active_res_scaling_config != this->resolution_scaling_config)
{
// First, try to reclaim any memory since the res scale upgrade is so memory intensive
if (const auto severity = vk::vmm_determine_memory_load_severity();
severity > rsx::problem_severity::low && m_rtts.handle_memory_pressure(*m_current_command_buffer, severity))
{
flush_command_queue(true);
}
// Then apply the change
m_rtts.sync_scaling_config(*m_current_command_buffer, active_res_scaling_config);
this->resolution_scaling_config = active_res_scaling_config;
// Finally reclaim any unused resources
if (const auto severity = vk::vmm_determine_memory_load_severity();
severity > rsx::problem_severity::low && m_rtts.handle_memory_pressure(*m_current_command_buffer, severity))
{
flush_command_queue(true);
}
}
}