From 60cf3dfebc6bc573fb90a1b9645bca43da3d65f6 Mon Sep 17 00:00:00 2001
From: Mary <me@thog.eu>
Date: Wed, 9 Jun 2021 00:50:18 +0200
Subject: [PATCH] Do not clear gpu subchannel state on BindChannel (#2348)

This fixes a regression caused by #980, that was causing a crash on New
Super Lucky's Tale.

As always, this need feedback on possible regression on any games.

Fix #2343.
---
 Ryujinx.Graphics.Gpu/Engine/GPFifo/GPFifoProcessor.cs |  2 +-
 Ryujinx.Graphics.Gpu/State/GpuState.cs                | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Ryujinx.Graphics.Gpu/Engine/GPFifo/GPFifoProcessor.cs b/Ryujinx.Graphics.Gpu/Engine/GPFifo/GPFifoProcessor.cs
index 32fd8b73d..78912bcc5 100644
--- a/Ryujinx.Graphics.Gpu/Engine/GPFifo/GPFifoProcessor.cs
+++ b/Ryujinx.Graphics.Gpu/Engine/GPFifo/GPFifoProcessor.cs
@@ -140,7 +140,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.GPFifo
         {
             if ((MethodOffset)meth.Method == MethodOffset.BindChannel)
             {
-                _subChannels[meth.SubChannel] = new GpuState();
+                _subChannels[meth.SubChannel].ClearCallbacks();
 
                 _context.Methods.RegisterCallbacks(_subChannels[meth.SubChannel]);
             }
diff --git a/Ryujinx.Graphics.Gpu/State/GpuState.cs b/Ryujinx.Graphics.Gpu/State/GpuState.cs
index 4b93dd45f..16dad5c10 100644
--- a/Ryujinx.Graphics.Gpu/State/GpuState.cs
+++ b/Ryujinx.Graphics.Gpu/State/GpuState.cs
@@ -210,6 +210,17 @@ namespace Ryujinx.Graphics.Gpu.State
             _registers[(int)offset].Callback = callback;
         }
 
+        /// <summary>
+        /// Clear all registered callbacks.
+        /// </summary>
+        public void ClearCallbacks()
+        {
+            for (int index = 0; index < _registers.Length; index++)
+            {
+                _registers[index].Callback = null;
+            }
+        }
+
         /// <summary>
         /// Checks if a given register has been modified since the last call to this method.
         /// </summary>