The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-02 15:54:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always reset all attached resources on Submit

Browse Source 
Certain resources can be attached to an empty `Submit` with no nodes, this can cause it to become a false dependency and not be removed till the next non-empty submission. This has now been fixed by doing a reset regardless of if any nodes exist.
This commit is contained in:
PixelyIon 2022-07-07 00:53:00 +05:30
parent 47db8e8cbc
commit 34e1e39d1c
No known key found for this signature in database
GPG Key ID: 11BC6C3201BC2C05
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp
View File

@ -290,8 +290,6 @@ namespace skyline::gpu::interconnect {
cycle->ChainCycle(attachedTexture->cycle); cycle->ChainCycle(attachedTexture->cycle);
attachedTexture->cycle = cycle; attachedTexture->cycle = cycle;
} }
attachedTextures.clear();
textureManagerLock.reset();
for (const auto &attachedBuffer : attachedBuffers) { for (const auto &attachedBuffer : attachedBuffers) {
if (attachedBuffer->UsedByContext()) { if (attachedBuffer->UsedByContext()) {
@ -300,17 +298,22 @@ namespace skyline::gpu::interconnect {
attachedBuffer->cycle = cycle; attachedBuffer->cycle = cycle;
} }
} }
}
}
void CommandExecutor::ResetInternal() {
attachedTextures.clear();
textureManagerLock.reset();
for (const auto &delegate : attachedBufferDelegates) { for (const auto &delegate : attachedBufferDelegates) {
delegate->usageCallback = nullptr; delegate->usageCallback = nullptr;
delegate->view->megabufferOffset = 0; delegate->view->megabufferOffset = 0;
} }
attachedBuffers.clear();
attachedBufferDelegates.clear(); attachedBufferDelegates.clear();
attachedBuffers.clear();
bufferManagerLock.reset(); bufferManagerLock.reset();
} }
}
void CommandExecutor::Submit() { void CommandExecutor::Submit() {
if (!nodes.empty()) { if (!nodes.empty()) {
@ -320,6 +323,7 @@ namespace skyline::gpu::interconnect {
cycle = activeCommandBuffer.GetFenceCycle(); cycle = activeCommandBuffer.GetFenceCycle();
megaBuffer = gpu.buffer.AcquireMegaBuffer(cycle); megaBuffer = gpu.buffer.AcquireMegaBuffer(cycle);
} }
ResetInternal();
} }
void CommandExecutor::SubmitWithFlush() { void CommandExecutor::SubmitWithFlush() {
@ -329,5 +333,6 @@ namespace skyline::gpu::interconnect {
cycle = activeCommandBuffer.Reset(); cycle = activeCommandBuffer.Reset();
megaBuffer.Reset(); megaBuffer.Reset();
} }
ResetInternal();
} }
} }

5
app/src/main/cpp/skyline/gpu/interconnect/command_executor.h
View File

@ -89,6 +89,11 @@ namespace skyline::gpu::interconnect {
*/ */
void SubmitInternal(); void SubmitInternal();
/**
* @brief Resets all the internal state, this must be called before starting a new submission as it clears everything from a past submission
*/
void ResetInternal();
public: public:
std::shared_ptr<FenceCycle> cycle; //!< The fence cycle that this command executor uses to wait for the GPU to finish executing commands std::shared_ptr<FenceCycle> cycle; //!< The fence cycle that this command executor uses to wait for the GPU to finish executing commands
MegaBuffer megaBuffer; //!< The megabuffer used to temporarily store buffer modifications allowing them to be replayed in-sequence on the GPU MegaBuffer megaBuffer; //!< The megabuffer used to temporarily store buffer modifications allowing them to be replayed in-sequence on the GPU