debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-08-20 06:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[TEST] Keep tuning the drain/ memory allocation"

Browse Source 
This reverts commit 7f4529b15d.
This commit is contained in:
CamilleLaVey
2026-07-30 16:53:25 -04:00
parent 5346e77c0a
commit dc9c99b22d
6 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video_core/buffer_cache/buffer_cache.h
+1 -3
View File
@@ -43,7 +43,7 @@ BufferCache<P>::~BufferCache() = default;
template <class P>
u64 BufferCache<P>::DeviceUsage(bool force_refresh) {
if (!runtime.CanReportAllocationUsage()) {
if (!runtime.CanReportMemoryUsage()) {
return total_used_memory;
}
if (force_refresh || usage_refresh_countdown == 0) {
@@ -61,7 +61,6 @@ u64 BufferCache<P>::ReclaimMemory(u64 target_bytes, bool allow_download) {
return 0;
}
in_reclaim = true;
sentenced_buffers.Reclaim(runtime.CompletedSyncPoint());
u64 freed = 0;
const auto clean_up = [&](BufferId buffer_id) {
if (freed >= target_bytes) {
@@ -83,7 +82,6 @@ u64 BufferCache<P>::ReclaimMemory(u64 target_bytes, bool allow_download) {
if (freed == 0) {
lru_cache.ForEachItemBelow(frame_tick > 0 ? frame_tick - 1 : 0, clean_up);
}
sentenced_buffers.Reclaim(runtime.CompletedSyncPoint());
in_reclaim = false;
usage_refresh_countdown = 0;
reclaim_stalled = freed == 0;
src/video_core/renderer_opengl/gl_buffer_cache.h
-4
View File
@@ -142,10 +142,6 @@ public:
return GetDeviceMemoryUsage();
}
bool CanReportAllocationUsage() const {
return device.CanReportMemoryUsage();
}
void BindFastUniformBuffer(size_t stage, u32 binding_index, u32 size) {
const GLuint handle = fast_uniforms[stage][binding_index].handle;
const GLsizeiptr gl_size = static_cast<GLsizeiptr>(size);
src/video_core/renderer_opengl/gl_texture_cache.h
-4
View File
@@ -91,10 +91,6 @@ public:
return GetDeviceMemoryUsage();
}
bool CanReportAllocationUsage() const {
return device.CanReportMemoryUsage();
}
bool CanReportMemoryUsage() const {
return device.CanReportMemoryUsage();
}
src/video_core/renderer_vulkan/vk_buffer_cache.h
-4
View File
@@ -110,10 +110,6 @@ public:
u64 GetDeviceAllocationUsage() const;
bool CanReportAllocationUsage() const noexcept {
return true;
}
bool CanReportMemoryUsage() const;
u32 GetUniformBufferAlignment() const;
src/video_core/renderer_vulkan/vk_texture_cache.h
-4
View File
@@ -72,10 +72,6 @@ public:
u64 GetDeviceAllocationUsage() const;
bool CanReportAllocationUsage() const noexcept {
return true;
}
bool CanReportMemoryUsage() const;
std::optional<size_t> GetSamplerHeapBudget() const;
src/video_core/texture_cache/texture_cache.h
+1 -10
View File
@@ -153,7 +153,7 @@ u64 TextureCache<P>::ImageSizeBytes(const ImageBase& image) {
template <class P>
u64 TextureCache<P>::DeviceUsage(bool force_refresh) {
if (!runtime.CanReportAllocationUsage()) {
if (!runtime.CanReportMemoryUsage()) {
return total_used_memory;
}
if (force_refresh || usage_refresh_countdown == 0) {
@@ -171,11 +171,6 @@ u64 TextureCache<P>::ReclaimMemory(u64 target_bytes, bool allow_download) {
return 0;
}
in_reclaim = true;
const u64 drain_point = runtime.CompletedSyncPoint();
TickEvictionDownloads(drain_point);
sentenced_images.Reclaim(drain_point);
sentenced_image_view.Reclaim(drain_point);
sentenced_framebuffers.Reclaim(drain_point);
u64 freed = 0;
const auto evict = [&](ImageId image_id) {
if (freed >= target_bytes) {
@@ -214,10 +209,6 @@ u64 TextureCache<P>::ReclaimMemory(u64 target_bytes, bool allow_download) {
if (freed == 0) {
lru_cache.ForEachItemBelow(frame_tick > 0 ? frame_tick - 1 : 0, evict);
}
const u64 exit_point = runtime.CompletedSyncPoint();
sentenced_images.Reclaim(exit_point);
sentenced_image_view.Reclaim(exit_point);
sentenced_framebuffers.Reclaim(exit_point);
in_reclaim = false;
usage_refresh_countdown = 0;
reclaim_stalled = freed == 0;