artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

FenceManager: Implement should wait.

Browse source
This commit is contained in:
Fernando Sahmkow 2020-02-17 22:15:43 -04:00
parent 1f345ebe3a
commit 57fdbd9b89
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/video_core/fence_manager.h
View file

@ -53,7 +53,10 @@ public:
void WaitPendingFences() { void WaitPendingFences() {
while (!fences.empty()) { while (!fences.empty()) {
TFence& current_fence = fences.front(); TFence& current_fence = fences.front();
WaitFence(current_fence); bool should_wait = texture_cache.ShouldWaitAsyncFlushes();
if (should_wait) {
WaitFence(current_fence);
}
texture_cache.PopAsyncFlushes(); texture_cache.PopAsyncFlushes();
auto& gpu{system.GPU()}; auto& gpu{system.GPU()};
auto& memory_manager{gpu.MemoryManager()}; auto& memory_manager{gpu.MemoryManager()};
@ -80,7 +83,8 @@ private:
void TryReleasePendingFences() { void TryReleasePendingFences() {
while (!fences.empty()) { while (!fences.empty()) {
TFence& current_fence = fences.front(); TFence& current_fence = fences.front();
if (!IsFenceSignaled(current_fence)) { bool should_wait = texture_cache.ShouldWaitAsyncFlushes();
if (should_wait && !IsFenceSignaled(current_fence)) {
return; return;
} }
texture_cache.PopAsyncFlushes(); texture_cache.PopAsyncFlushes();

11
src/video_core/texture_cache/texture_cache.h
View file

@ -322,6 +322,17 @@ public:
uncommited_flushes.reset(); uncommited_flushes.reset();
} }
bool ShouldWaitAsyncFlushes() {
if (commited_flushes.empty()) {
return false;
}
auto& flush_list = commited_flushes.front();
if (!flush_list) {
return false;
}
return true;
}
void PopAsyncFlushes() { void PopAsyncFlushes() {
if (commited_flushes.empty()) { if (commited_flushes.empty()) {
return; return;