From 2556966ec5aa4315b3f20ecf581ed0c17eea7271 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Thu, 29 Sep 2022 21:39:08 +0100 Subject: [PATCH] Don't attach textures to the active cycle in AttachTexture --- app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp b/app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp index 88d53651..4ce188bb 100644 --- a/app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp +++ b/app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp @@ -233,11 +233,10 @@ namespace skyline::gpu::interconnect { // Avoids a potential deadlock with this resource being locked while acquiring the TextureManager lock while the thread owning it tries to acquire a lock on this texture textureManagerLock.emplace(gpu.texture); - cycle->AttachObject(view->shared_from_this()); - bool didLock{view->LockWithTag(tag)}; if (didLock) attachedTextures.emplace_back(view->texture); + return didLock; }