pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-03-22 17:46:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix(android): Add static_cast's for Android Warnings' (#113) from fix/compiler into main

Browse Source 
Reviewed-on: https://git.citron-emu.org/Citron/Emulator/pulls/113
This commit is contained in:
Collecting
2026-01-25 14:37:51 +01:00
parent 2b18a97e12 be9fbddd5d
commit 851e8da116
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/video_core/buffer_cache/buffer_cache.h
View File

@@ -43,7 +43,7 @@ BufferCache<P>::BufferCache(Tegra::MaxwellDeviceMemoryManager& device_memory_, R
if (configured_limit_mb > 0) { if (configured_limit_mb > 0) {
vram_limit_bytes = static_cast<u64>(configured_limit_mb) * 1_MiB; vram_limit_bytes = static_cast<u64>(configured_limit_mb) * 1_MiB;
} else { } else {
vram_limit_bytes = static_cast<u64>(device_local_memory * 0.80); vram_limit_bytes = static_cast<u64>(static_cast<double>(device_local_memory) * 0.80);
} }
// Adjust thresholds based on GC aggressiveness setting // Adjust thresholds based on GC aggressiveness setting
@@ -74,8 +74,8 @@ BufferCache<P>::BufferCache(Tegra::MaxwellDeviceMemoryManager& device_memory_, R
break; break;
} }
minimum_memory = static_cast<u64>(vram_limit_bytes * expected_ratio); minimum_memory = static_cast<u64>(static_cast<f32>(vram_limit_bytes) * expected_ratio);
critical_memory = static_cast<u64>(vram_limit_bytes * critical_ratio); critical_memory = static_cast<u64>(static_cast<f32>(vram_limit_bytes) * critical_ratio);
LOG_INFO(Render_Vulkan, LOG_INFO(Render_Vulkan,
"Buffer cache VRAM initialized: limit={}MB, minimum={}MB, critical={}MB", "Buffer cache VRAM initialized: limit={}MB, minimum={}MB, critical={}MB",
@@ -95,7 +95,7 @@ void BufferCache<P>::RunGarbageCollector() {
} }
const bool aggressive_gc = total_used_memory >= critical_memory; const bool aggressive_gc = total_used_memory >= critical_memory;
const bool emergency_gc = total_used_memory >= static_cast<u64>(vram_limit_bytes * BUFFER_VRAM_CRITICAL_THRESHOLD); const bool emergency_gc = total_used_memory >= static_cast<u64>(static_cast<f32>(vram_limit_bytes) * BUFFER_VRAM_CRITICAL_THRESHOLD);
// FIXED: VRAM leak prevention - Get eviction frames from settings // FIXED: VRAM leak prevention - Get eviction frames from settings
const u64 eviction_frames = Settings::values.buffer_eviction_frames.GetValue(); const u64 eviction_frames = Settings::values.buffer_eviction_frames.GetValue();
@@ -207,7 +207,7 @@ void BufferCache<P>::TickFrame() {
const auto gc_level = Settings::values.gc_aggressiveness.GetValue(); const auto gc_level = Settings::values.gc_aggressiveness.GetValue();
const bool should_gc = gc_level != Settings::GCAggressiveness::Off && const bool should_gc = gc_level != Settings::GCAggressiveness::Off &&
(total_used_memory >= minimum_memory || (total_used_memory >= minimum_memory ||
total_used_memory >= static_cast<u64>(vram_limit_bytes * BUFFER_VRAM_WARNING_THRESHOLD)); total_used_memory >= static_cast<u64>(static_cast<f32>(vram_limit_bytes) * BUFFER_VRAM_WARNING_THRESHOLD));
if (should_gc) { if (should_gc) {
RunGarbageCollector(); RunGarbageCollector();

2
src/video_core/texture_cache/texture_cache.h
View File

@@ -175,7 +175,7 @@ void TextureCache<P>::RunGarbageCollector() {
num_iterations = base_iterations * 2; num_iterations = base_iterations * 2;
} else if (high_priority_mode) { } else if (high_priority_mode) {
ticks_to_destroy = base_ticks; ticks_to_destroy = base_ticks;
num_iterations = static_cast<size_t>(base_iterations * 1.5); num_iterations = static_cast<size_t>(static_cast<double>(base_iterations) * 1.5);
} else { } else {
ticks_to_destroy = base_ticks * 2; ticks_to_destroy = base_ticks * 2;
num_iterations = base_iterations; num_iterations = base_iterations;