The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-23 18:19:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Texture Trap Data Race

Browse Source 
The trap callbacks did not wait on the `Texture` to complete synchronization to the guest, this resulted in races where the contents written to the texture would be overwritten by the synced content. This commit fixes that by waiting on the fences at the end of the trap callback.
This commit is contained in:
PixelyIon 2022-07-13 21:40:41 +05:30
parent cb7c3602e7
commit 4f6a67af36
No known key found for this signature in database
GPG Key ID: 11BC6C3201BC2C05
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/cpp/skyline/gpu/texture/texture.cpp
View File

@ -150,6 +150,7 @@ namespace skyline::gpu {
if (!lock) if (!lock)
return false; return false;
SynchronizeGuest(true); // We can skip trapping since the caller will do it SynchronizeGuest(true); // We can skip trapping since the caller will do it
WaitOnFence();
return true; return true;
}, [this] { }, [this] {
DirtyState expectedState{DirtyState::Clean}; DirtyState expectedState{DirtyState::Clean};
@ -161,6 +162,7 @@ namespace skyline::gpu {
return false; return false;
SynchronizeGuest(true); SynchronizeGuest(true);
dirtyState = DirtyState::CpuDirty; // We need to assume the texture is dirty since we don't know what the guest is writing dirtyState = DirtyState::CpuDirty; // We need to assume the texture is dirty since we don't know what the guest is writing
WaitOnFence();
return true; return true;
}); });
} }