From b22f46603853f7c8be332a3f556ece3102245e8c Mon Sep 17 00:00:00 2001
From: MaranBr <maranbr@outlook.com>
Date: Thu, 4 Dec 2025 11:06:27 -0400
Subject: [PATCH] Revert "Try to fix deadlocks on Android"

This reverts commit f7400a11a84012e40aba3fd0ccd0ee6f76a9c826.
---
 src/video_core/fence_manager.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h
index 5c5b110ea7..61e4da9609 100644
--- a/src/video_core/fence_manager.h
+++ b/src/video_core/fence_manager.h
@@ -77,11 +77,7 @@ public:
         }
         const bool should_flush = ShouldFlush();
         CommitAsyncFlushes();
-#ifdef __ANDROID__
-        TFence new_fence = CreateFence(true);
-#else
         TFence new_fence = CreateFence(!should_flush);
-#endif
         if constexpr (can_async_check) {
             guard.lock();
         }
@@ -203,21 +199,13 @@ private:
 
         TFence current_fence;
         std::deque<std::function<void()>> current_operations;
-
         while (!stop_token.stop_requested()) {
             {
                 std::unique_lock lock(guard);
-#ifdef __ANDROID__
-                cv.wait_for(lock, std::chrono::milliseconds(5), [&] { return stop_token.stop_requested() || !fences.empty(); });
-#else
                 cv.wait(lock, [&] { return stop_token.stop_requested() || !fences.empty(); });
-#endif
                 if (stop_token.stop_requested()) [[unlikely]] {
                     return;
                 }
-                if (fences.empty()) {
-                    continue;
-                }
                 current_fence = std::move(fences.front());
                 current_operations = std::move(pending_operations.front());
                 fences.pop();