mirror of
https://github.com/skyline-emu/skyline.git
synced 2024-11-05 20:45:09 +01:00
Disable preserve buffer/texture attachment opt for now
Causes several issues and crashes in Pokemon without an obvious cause.
This commit is contained in:
parent
e483cf9634
commit
1cfc4278f9
@ -251,10 +251,11 @@ namespace skyline::gpu::interconnect {
|
||||
bool CommandExecutor::AttachTexture(TextureView *view) {
|
||||
bool didLock{view->LockWithTag(tag)};
|
||||
if (didLock) {
|
||||
if (view->texture->FrequentlyLocked())
|
||||
attachedTextures.emplace_back(view->texture);
|
||||
else
|
||||
preserveAttachedTextures.emplace_back(view->texture);
|
||||
// TODO: fixup remaining bugs with this and add better heuristics to avoid pauses
|
||||
// if (view->texture->FrequentlyLocked())
|
||||
attachedTextures.emplace_back(view->texture);
|
||||
// else
|
||||
// preserveAttachedTextures.emplace_back(view->texture);
|
||||
}
|
||||
|
||||
return didLock;
|
||||
@ -273,34 +274,33 @@ namespace skyline::gpu::interconnect {
|
||||
buffer->unlock();
|
||||
}
|
||||
|
||||
void CommandExecutor::AttachBufferBase(std::shared_ptr<Buffer> buffer) {
|
||||
// TODO: fixup remaining bugs with this and add better heuristics to avoid pauses
|
||||
// if (buffer->FrequentlyLocked())
|
||||
attachedBuffers.emplace_back(std::move(buffer));
|
||||
// else
|
||||
// preserveAttachedBuffers.emplace_back(std::move(buffer));
|
||||
}
|
||||
|
||||
bool CommandExecutor::AttachBuffer(BufferView &view) {
|
||||
bool didLock{view.LockWithTag(tag)};
|
||||
if (didLock) {
|
||||
if (view.GetBuffer()->FrequentlyLocked())
|
||||
attachedBuffers.emplace_back(view.GetBuffer()->shared_from_this());
|
||||
else
|
||||
preserveAttachedBuffers.emplace_back(view.GetBuffer()->shared_from_this());
|
||||
}
|
||||
if (didLock)
|
||||
AttachBufferBase(view.GetBuffer()->shared_from_this());
|
||||
|
||||
return didLock;
|
||||
}
|
||||
|
||||
void CommandExecutor::AttachLockedBufferView(BufferView &view, ContextLock<BufferView> &&lock) {
|
||||
if (lock.OwnsLock()) {
|
||||
// Transfer ownership to executor so that the resource will stay locked for the period it is used on the GPU
|
||||
if (view.GetBuffer()->FrequentlyLocked())
|
||||
attachedBuffers.emplace_back(view.GetBuffer()->shared_from_this());
|
||||
else
|
||||
preserveAttachedBuffers.emplace_back(view.GetBuffer()->shared_from_this());
|
||||
AttachBufferBase(view.GetBuffer()->shared_from_this());
|
||||
lock.Release(); // The executor will handle unlocking the lock so it doesn't need to be handled here
|
||||
}
|
||||
}
|
||||
|
||||
void CommandExecutor::AttachLockedBuffer(std::shared_ptr<Buffer> buffer, ContextLock<Buffer> &&lock) {
|
||||
if (lock.OwnsLock()) {
|
||||
if (buffer->FrequentlyLocked())
|
||||
attachedBuffers.emplace_back(std::move(buffer));
|
||||
else
|
||||
preserveAttachedBuffers.emplace_back(std::move(buffer));
|
||||
AttachBufferBase(std::move(buffer));
|
||||
lock.Release(); // See AttachLockedBufferView(...)
|
||||
}
|
||||
}
|
||||
|
@ -154,6 +154,8 @@ namespace skyline::gpu::interconnect {
|
||||
*/
|
||||
void ResetInternal();
|
||||
|
||||
void AttachBufferBase(std::shared_ptr<Buffer> buffer);
|
||||
|
||||
public:
|
||||
std::shared_ptr<FenceCycle> cycle; //!< The fence cycle that this command executor uses to wait for the GPU to finish executing commands
|
||||
LinearAllocatorState<> *allocator;
|
||||
|
Loading…
Reference in New Issue
Block a user