Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

Revert [Android] 0 FPS Error fix for certain titles.

CamilleLaVeybe9a415157bc
diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h
index a2411af63c..2135f1f2da 100644
--- a/src/video_core/fence_manager.h
+++ b/src/video_core/fence_manager.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@@ -76,27 +73,15 @@ public:
void SignalFence(std::function<void()>&& func) {
bool delay_fence = Settings::IsGPULevelHigh();
- #ifdef __ANDROID__
- if (!delay_fence) {
- TryReleasePendingFences<false>();
- }
- #else
if constexpr (!can_async_check) {
TryReleasePendingFences<false>();
}
- #endif
const bool should_flush = ShouldFlush();
CommitAsyncFlushes();
TFence new_fence = CreateFence(!should_flush);
- #ifdef __ANDROID__
- if (delay_fence) {
- guard.lock();
- }
- #else
if constexpr (can_async_check) {
guard.lock();
}
- #endif
if (delay_fence) {
uncommitted_operations.emplace_back(std::move(func));
}
@@ -109,17 +94,10 @@ public:
if (should_flush) {
rasterizer.FlushCommands();
}
- #ifdef __ANDROID__
- if (delay_fence) {
- guard.unlock();
- cv.notify_all();
- }
- #else
if constexpr (can_async_check) {
guard.unlock();
cv.notify_all();
}
- #endif
rasterizer.InvalidateGPUCache();
}