From b10db7e4a5f43414679b7969ea309b1829937a37 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Tue, 18 Feb 2020 17:20:39 -0400
Subject: FenceManager: Implement async buffer cache flushes on High settings

---
 src/video_core/fence_manager.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/video_core/fence_manager.h')

diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h
index 036f3996c..c4b190503 100644
--- a/src/video_core/fence_manager.h
+++ b/src/video_core/fence_manager.h
@@ -6,8 +6,8 @@
 
 #include <algorithm>
 #include <array>
-#include <queue>
 #include <memory>
+#include <queue>
 
 #include "common/assert.h"
 #include "common/common_types.h"
@@ -37,7 +37,7 @@ private:
     u32 payload;
 };
 
-template <typename TFence, typename TTextureCache>
+template <typename TFence, typename TTextureCache, typename TTBufferCache>
 class FenceManager {
 public:
     void SignalFence(GPUVAddr addr, u32 value) {
@@ -46,6 +46,7 @@ public:
         QueueFence(new_fence);
         fences.push(new_fence);
         texture_cache.CommitAsyncFlushes();
+        buffer_cache.CommitAsyncFlushes();
         rasterizer.FlushCommands();
         rasterizer.SyncGuestHost();
     }
@@ -54,10 +55,12 @@ public:
         while (!fences.empty()) {
             TFence& current_fence = fences.front();
             bool should_wait = texture_cache.ShouldWaitAsyncFlushes();
+            should_wait |= buffer_cache.ShouldWaitAsyncFlushes();
             if (should_wait) {
                 WaitFence(current_fence);
             }
             texture_cache.PopAsyncFlushes();
+            buffer_cache.PopAsyncFlushes();
             auto& gpu{system.GPU()};
             auto& memory_manager{gpu.MemoryManager()};
             memory_manager.Write<u32>(current_fence->GetAddress(), current_fence->GetPayload());
@@ -67,8 +70,9 @@ public:
 
 protected:
     FenceManager(Core::System& system, VideoCore::RasterizerInterface& rasterizer,
-                 TTextureCache& texture_cache)
-        : system{system}, rasterizer{rasterizer}, texture_cache{texture_cache} {}
+                 TTextureCache& texture_cache, TTBufferCache& buffer_cache)
+        : system{system}, rasterizer{rasterizer}, texture_cache{texture_cache}, buffer_cache{
+                                                                                    buffer_cache} {}
 
     virtual TFence CreateFence(GPUVAddr addr, u32 value) = 0;
     virtual void QueueFence(TFence& fence) = 0;
@@ -78,16 +82,19 @@ protected:
     Core::System& system;
     VideoCore::RasterizerInterface& rasterizer;
     TTextureCache& texture_cache;
+    TTBufferCache& buffer_cache;
 
 private:
     void TryReleasePendingFences() {
         while (!fences.empty()) {
             TFence& current_fence = fences.front();
             bool should_wait = texture_cache.ShouldWaitAsyncFlushes();
+            should_wait |= buffer_cache.ShouldWaitAsyncFlushes();
             if (should_wait && !IsFenceSignaled(current_fence)) {
                 return;
             }
             texture_cache.PopAsyncFlushes();
+            buffer_cache.PopAsyncFlushes();
             auto& gpu{system.GPU()};
             auto& memory_manager{gpu.MemoryManager()};
             memory_manager.Write<u32>(current_fence->GetAddress(), current_fence->GetPayload());
-- 
cgit v1.2.3