Use correct offset for storage constant buffer elimination (#4821)

* GPU: Remove CPU region handle containers.

Another one for the "I don't know why I didn't do this earlier" pile.

This removes the "Cpu" prefixed region handle classes, which each mirror a region handle type from Ryujinx.Memory.

Originally, not all projects had a reference to Ryujinx.Memory, so these classes were introduced to bridge the gap. Someone else crossed that bridge since, so these classes don't have much of a purpose anymore.

This PR replaces all uses of CpuRegionHandle etc to their direct Ryujinx.Memory versions.

RegionHandle methods (specifically QueryModified) are about the hottest path there is in the entire emulator, so there is a nice boost from doing this.

* Add docs

src/Ryujinx.Ava/Common/ApplicationHelper.cs

@@ -233,9 +233,14 @@ namespace Ryujinx.Ava.Common
 
                     try
                     {
-                        IFileSystem ncaFileSystem = patchNca != null
-                            ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
-                            : mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
+                        bool sectionExistsInPatch = false;
+                        if (patchNca != null)
+                        {
+                            sectionExistsInPatch = patchNca.CanOpenSection(index);
+                        }
+
+                        IFileSystem ncaFileSystem = sectionExistsInPatch ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
+                                                                         : mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
 
                         FileSystemClient fsClient = _horizonClient.Fs;
 

src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml

@@ -65,7 +65,7 @@
     </MenuItem>
     <MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
         <MenuItem
-            Click="ExtractApplicationLogo_Click"
+            Click="ExtractApplicationExeFs_Click"
             Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
             ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
         <MenuItem
@@ -73,7 +73,7 @@
             Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
             ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
         <MenuItem
-            Click="ExtractApplicationExeFs_Click"
+            Click="ExtractApplicationLogo_Click"
             Header="{locale:Locale GameListContextMenuExtractDataLogo}"
             ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
     </MenuItem>

src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -289,13 +289,13 @@ namespace Ryujinx.Ava.UI.Controls
             }
         }
 
-        public async void ExtractApplicationLogo_Click(object sender, RoutedEventArgs args)
+        public async void ExtractApplicationExeFs_Click(object sender, RoutedEventArgs args)
         {
             var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
 
             if (viewModel?.SelectedApplication != null)
             {
-                await ApplicationHelper.ExtractSection(NcaSectionType.Logo, viewModel.SelectedApplication.Path, viewModel.SelectedApplication.TitleName);
+                await ApplicationHelper.ExtractSection(NcaSectionType.Code, viewModel.SelectedApplication.Path, viewModel.SelectedApplication.TitleName);
             }
         }
 
@@ -309,13 +309,13 @@ namespace Ryujinx.Ava.UI.Controls
             }
         }
 
-        public async void ExtractApplicationExeFs_Click(object sender, RoutedEventArgs args)
+        public async void ExtractApplicationLogo_Click(object sender, RoutedEventArgs args)
         {
             var viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
 
             if (viewModel?.SelectedApplication != null)
             {
-                await ApplicationHelper.ExtractSection(NcaSectionType.Code, viewModel.SelectedApplication.Path, viewModel.SelectedApplication.TitleName);
+                await ApplicationHelper.ExtractSection(NcaSectionType.Logo, viewModel.SelectedApplication.Path, viewModel.SelectedApplication.TitleName);
             }
         }
     }

src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs

@@ -1,5 +1,4 @@
 using ARMeilleure.Memory;
-using Ryujinx.Cpu.Tracking;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using Ryujinx.Memory.Tracking;
@@ -822,21 +821,21 @@ namespace Ryujinx.Cpu.AppleHv
         }
 
         /// <inheritdoc/>
-        public CpuRegionHandle BeginTracking(ulong address, ulong size, int id)
+        public RegionHandle BeginTracking(ulong address, ulong size, int id)
         {
-            return new CpuRegionHandle(Tracking.BeginTracking(address, size, id));
+            return Tracking.BeginTracking(address, size, id);
         }
 
         /// <inheritdoc/>
-        public CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
+        public MultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
         {
-            return new CpuMultiRegionHandle(Tracking.BeginGranularTracking(address, size, handles, granularity, id));
+            return Tracking.BeginGranularTracking(address, size, handles, granularity, id);
         }
 
         /// <inheritdoc/>
-        public CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
+        public SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
         {
-            return new CpuSmartMultiRegionHandle(Tracking.BeginSmartGranularTracking(address, size, granularity, id));
+            return Tracking.BeginSmartGranularTracking(address, size, granularity, id);
         }
 
         /// <summary>

src/Ryujinx.Cpu/IVirtualMemoryManagerTracked.cs

@@ -1,5 +1,4 @@
-using Ryujinx.Cpu.Tracking;
-using Ryujinx.Memory;
+using Ryujinx.Memory;
 using Ryujinx.Memory.Tracking;
 using System;
 using System.Collections.Generic;
@@ -30,7 +29,7 @@ namespace Ryujinx.Cpu
         /// <param name="size">Size of the region</param>
         /// <param name="id">Handle ID</param>
         /// <returns>The memory tracking handle</returns>
-        CpuRegionHandle BeginTracking(ulong address, ulong size, int id);
+        RegionHandle BeginTracking(ulong address, ulong size, int id);
 
         /// <summary>
         /// Obtains a memory tracking handle for the given virtual region, with a specified granularity. This should be disposed when finished with.
@@ -41,7 +40,7 @@ namespace Ryujinx.Cpu
         /// <param name="granularity">Desired granularity of write tracking</param>
         /// <param name="id">Handle ID</param>
         /// <returns>The memory tracking handle</returns>
-        CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id);
+        MultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id);
 
         /// <summary>
         /// Obtains a smart memory tracking handle for the given virtual region, with a specified granularity. This should be disposed when finished with.
@@ -51,6 +50,6 @@ namespace Ryujinx.Cpu
         /// <param name="granularity">Desired granularity of write tracking</param>
         /// <param name="id">Handle ID</param>
         /// <returns>The memory tracking handle</returns>
-        CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id);
+        SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id);
     }
 }

src/Ryujinx.Cpu/Jit/MemoryManager.cs

@@ -1,5 +1,4 @@
 using ARMeilleure.Memory;
-using Ryujinx.Cpu.Tracking;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using Ryujinx.Memory.Tracking;
@@ -629,21 +628,21 @@ namespace Ryujinx.Cpu.Jit
         }
 
         /// <inheritdoc/>
-        public CpuRegionHandle BeginTracking(ulong address, ulong size, int id)
+        public RegionHandle BeginTracking(ulong address, ulong size, int id)
         {
-            return new CpuRegionHandle(Tracking.BeginTracking(address, size, id));
+            return Tracking.BeginTracking(address, size, id);
         }
 
         /// <inheritdoc/>
-        public CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
+        public MultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
         {
-            return new CpuMultiRegionHandle(Tracking.BeginGranularTracking(address, size, handles, granularity, id));
+            return Tracking.BeginGranularTracking(address, size, handles, granularity, id);
         }
 
         /// <inheritdoc/>
-        public CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
+        public SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
         {
-            return new CpuSmartMultiRegionHandle(Tracking.BeginSmartGranularTracking(address, size, granularity, id));
+            return Tracking.BeginSmartGranularTracking(address, size, granularity, id);
         }
 
         /// <inheritdoc/>

src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs

@@ -1,5 +1,4 @@
 using ARMeilleure.Memory;
-using Ryujinx.Cpu.Tracking;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
 using Ryujinx.Memory.Tracking;
@@ -706,21 +705,21 @@ namespace Ryujinx.Cpu.Jit
         }
 
         /// <inheritdoc/>
-        public CpuRegionHandle BeginTracking(ulong address, ulong size, int id)
+        public RegionHandle BeginTracking(ulong address, ulong size, int id)
         {
-            return new CpuRegionHandle(Tracking.BeginTracking(address, size, id));
+            return Tracking.BeginTracking(address, size, id);
         }
 
         /// <inheritdoc/>
-        public CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
+        public MultiRegionHandle BeginGranularTracking(ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity, int id)
         {
-            return new CpuMultiRegionHandle(Tracking.BeginGranularTracking(address, size, handles, granularity, id));
+            return Tracking.BeginGranularTracking(address, size, handles, granularity, id);
         }
 
         /// <inheritdoc/>
-        public CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
+        public SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ulong granularity, int id)
         {
-            return new CpuSmartMultiRegionHandle(Tracking.BeginSmartGranularTracking(address, size, granularity, id));
+            return Tracking.BeginSmartGranularTracking(address, size, granularity, id);
         }
 
         /// <summary>

src/Ryujinx.Cpu/Tracking/CpuMultiRegionHandle.cs

@@ -1,28 +0,0 @@
-using Ryujinx.Memory.Tracking;
-using System;
-using System.Collections.Generic;
-
-namespace Ryujinx.Cpu.Tracking
-{
-    public class CpuMultiRegionHandle : IMultiRegionHandle
-    {
-        private readonly MultiRegionHandle _impl;
-
-        public bool Dirty => _impl.Dirty;
-
-        internal CpuMultiRegionHandle(MultiRegionHandle impl)
-        {
-            _impl = impl;
-        }
-
-        public void Dispose() => _impl.Dispose();
-        public void ForceDirty(ulong address, ulong size) => _impl.ForceDirty(address, size);
-        public IEnumerable<IRegionHandle> GetHandles() => _impl.GetHandles();
-        public void QueryModified(Action<ulong, ulong> modifiedAction) => _impl.QueryModified(modifiedAction);
-        public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction) => _impl.QueryModified(address, size, modifiedAction);
-        public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction, int sequenceNumber) => _impl.QueryModified(address, size, modifiedAction, sequenceNumber);
-        public void RegisterAction(ulong address, ulong size, RegionSignal action) => _impl.RegisterAction(address, size, action);
-        public void RegisterPreciseAction(ulong address, ulong size, PreciseRegionSignal action) => _impl.RegisterPreciseAction(address, size, action);
-        public void SignalWrite() => _impl.SignalWrite();
-    }
-}

src/Ryujinx.Cpu/Tracking/CpuRegionHandle.cs

@@ -1,37 +0,0 @@
-using Ryujinx.Memory.Tracking;
-using System;
-
-namespace Ryujinx.Cpu.Tracking
-{
-    public class CpuRegionHandle : IRegionHandle
-    {
-        private readonly RegionHandle _impl;
-
-        public bool Dirty => _impl.Dirty;
-        public bool Unmapped => _impl.Unmapped;
-        public ulong Address => _impl.Address;
-        public ulong Size => _impl.Size;
-        public ulong EndAddress => _impl.EndAddress;
-
-        internal CpuRegionHandle(RegionHandle impl)
-        {
-            _impl = impl;
-        }
-
-        public void Dispose() => _impl.Dispose();
-        public bool DirtyOrVolatile() => _impl.DirtyOrVolatile();
-        public void ForceDirty() => _impl.ForceDirty();
-        public IRegionHandle GetHandle() => _impl;
-        public void RegisterAction(RegionSignal action) => _impl.RegisterAction(action);
-        public void RegisterPreciseAction(PreciseRegionSignal action) => _impl.RegisterPreciseAction(action);
-        public void RegisterDirtyEvent(Action action) => _impl.RegisterDirtyEvent(action);
-        public void Reprotect(bool asDirty = false) => _impl.Reprotect(asDirty);
-
-        public bool OverlapsWith(ulong address, ulong size) => _impl.OverlapsWith(address, size);
-
-        public bool RangeEquals(CpuRegionHandle other)
-        {
-            return _impl.RealAddress == other._impl.RealAddress && _impl.RealSize == other._impl.RealSize;
-        }
-    }
-}

src/Ryujinx.Cpu/Tracking/CpuSmartMultiRegionHandle.cs

@@ -1,26 +0,0 @@
-using Ryujinx.Memory.Tracking;
-using System;
-
-namespace Ryujinx.Cpu.Tracking
-{
-    public class CpuSmartMultiRegionHandle : IMultiRegionHandle
-    {
-        private readonly SmartMultiRegionHandle _impl;
-
-        public bool Dirty => _impl.Dirty;
-
-        internal CpuSmartMultiRegionHandle(SmartMultiRegionHandle impl)
-        {
-            _impl = impl;
-        }
-
-        public void Dispose() => _impl.Dispose();
-        public void ForceDirty(ulong address, ulong size) => _impl.ForceDirty(address, size);
-        public void RegisterAction(RegionSignal action) => _impl.RegisterAction(action);
-        public void RegisterPreciseAction(PreciseRegionSignal action) => _impl.RegisterPreciseAction(action);
-        public void QueryModified(Action<ulong, ulong> modifiedAction) => _impl.QueryModified(modifiedAction);
-        public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction) => _impl.QueryModified(address, size, modifiedAction);
-        public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction, int sequenceNumber) => _impl.QueryModified(address, size, modifiedAction, sequenceNumber);
-        public void SignalWrite() => _impl.SignalWrite();
-    }
-}

src/Ryujinx.Graphics.Gpu/Image/Pool.cs

@@ -1,5 +1,5 @@
-using Ryujinx.Cpu.Tracking;
 using Ryujinx.Graphics.Gpu.Memory;
+using Ryujinx.Memory.Tracking;
 using System;
 using System.Runtime.InteropServices;
 
@@ -40,7 +40,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public ulong Size { get; }
 
-        private readonly CpuMultiRegionHandle _memoryTracking;
+        private readonly MultiRegionHandle _memoryTracking;
         private readonly Action<ulong, ulong> _modifiedDelegate;
 
         private int _modifiedSequenceOffset;

src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs

@@ -1,10 +1,10 @@
 using Ryujinx.Common.Memory;
-using Ryujinx.Cpu.Tracking;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Texture;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
+using Ryujinx.Memory.Tracking;
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
@@ -255,7 +255,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                 {
                     TextureGroupHandle group = _handles[baseHandle + i];
 
-                    foreach (CpuRegionHandle handle in group.Handles)
+                    foreach (RegionHandle handle in group.Handles)
                     {
                         if (handle.Dirty)
                         {
@@ -296,7 +296,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                     bool handleDirty = false;
                     bool handleUnmapped = false;
 
-                    foreach (CpuRegionHandle handle in group.Handles)
+                    foreach (RegionHandle handle in group.Handles)
                     {
                         if (handle.Dirty)
                         {
@@ -703,7 +703,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="group">The group to register an action for</param>
         public void RegisterAction(TextureGroupHandle group)
         {
-            foreach (CpuRegionHandle handle in group.Handles)
+            foreach (RegionHandle handle in group.Handles)
             {
                 handle.RegisterAction((address, size) => FlushAction(group, address, size));
             }
@@ -985,7 +985,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="address">The start address of the tracked region</param>
         /// <param name="size">The size of the tracked region</param>
         /// <returns>A CpuRegionHandle covering the given range</returns>
-        private CpuRegionHandle GenerateHandle(ulong address, ulong size)
+        private RegionHandle GenerateHandle(ulong address, ulong size)
         {
             return _physicalMemory.BeginTracking(address, size, ResourceKind.Texture);
         }
@@ -1005,7 +1005,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             int endOffset = _allOffsets[viewEnd] + _sliceSizes[lastLevel];
             int size = endOffset - offset;
 
-            var result = new List<CpuRegionHandle>();
+            var result = new List<RegionHandle>();
 
             for (int i = 0; i < TextureRange.Count; i++)
             {
@@ -1050,7 +1050,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                 views,
                 result.ToArray());
 
-            foreach (CpuRegionHandle handle in result)
+            foreach (RegionHandle handle in result)
             {
                 handle.RegisterDirtyEvent(() => DirtyAction(groupHandle));
             }
@@ -1248,7 +1248,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                                 continue;
                             }
 
-                            foreach (CpuRegionHandle handle in groupHandle.Handles)
+                            foreach (RegionHandle handle in groupHandle.Handles)
                             {
                                 bool hasMatch = false;
 
@@ -1270,7 +1270,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                     }
                     else
                     {
-                        foreach (CpuRegionHandle handle in groupHandle.Handles)
+                        foreach (RegionHandle handle in groupHandle.Handles)
                         {
                             handle.Reprotect();
                         }
@@ -1303,7 +1303,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             if (!(_hasMipViews || _hasLayerViews))
             {
                 // Single dirty region.
-                var cpuRegionHandles = new CpuRegionHandle[TextureRange.Count];
+                var cpuRegionHandles = new RegionHandle[TextureRange.Count];
                 int count = 0;
 
                 for (int i = 0; i < TextureRange.Count; i++)
@@ -1322,7 +1322,7 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                 var groupHandle = new TextureGroupHandle(this, 0, Storage.Size, _views, 0, 0, 0, _allOffsets.Length, cpuRegionHandles);
 
-                foreach (CpuRegionHandle handle in cpuRegionHandles)
+                foreach (RegionHandle handle in cpuRegionHandles)
                 {
                     handle.RegisterDirtyEvent(() => DirtyAction(groupHandle));
                 }

src/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs

@@ -1,5 +1,5 @@
-using Ryujinx.Cpu.Tracking;
-using Ryujinx.Graphics.Gpu.Synchronization;
+using Ryujinx.Graphics.Gpu.Synchronization;
+using Ryujinx.Memory.Tracking;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -85,7 +85,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <summary>
         /// The CPU memory tracking handles that cover this handle.
         /// </summary>
-        public CpuRegionHandle[] Handles { get; }
+        public RegionHandle[] Handles { get; }
 
         /// <summary>
         /// True if a texture overlapping this handle has been modified. Is set false when the flush action is called.
@@ -127,7 +127,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                                   int firstLevel,
                                   int baseSlice,
                                   int sliceCount,
-                                  CpuRegionHandle[] handles)
+                                  RegionHandle[] handles)
         {
             _group = group;
             _firstLayer = firstLayer;
@@ -642,7 +642,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public void Dispose()
         {
-            foreach (CpuRegionHandle handle in Handles)
+            foreach (RegionHandle handle in Handles)
             {
                 handle.Dispose();
             }

src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Cpu.Tracking;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Synchronization;
 using Ryujinx.Memory.Range;
@@ -54,8 +53,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </remarks>
         private BufferModifiedRangeList _modifiedRanges = null;
 
-        private readonly CpuMultiRegionHandle _memoryTrackingGranular;
-        private readonly CpuRegionHandle _memoryTracking;
+        private readonly MultiRegionHandle _memoryTrackingGranular;
+        private readonly RegionHandle _memoryTracking;
 
         private readonly RegionSignal _externalFlushDelegate;
         private readonly Action<ulong, ulong> _loadDelegate;
@@ -102,7 +101,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                     }
                     else
                     {
-                        return Enumerable.Repeat(buffer._memoryTracking.GetHandle(), 1);
+                        return Enumerable.Repeat(buffer._memoryTracking, 1);
                     }
                 });
             }

src/Ryujinx.Graphics.Gpu/Memory/GpuRegionHandle.cs

@@ -1,5 +1,4 @@
-using Ryujinx.Cpu.Tracking;
-using Ryujinx.Memory.Tracking;
+using Ryujinx.Memory.Tracking;
 using System;
 
 namespace Ryujinx.Graphics.Gpu.Memory
@@ -9,7 +8,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
     /// </summary>
     class GpuRegionHandle : IRegionHandle
     {
-        private readonly CpuRegionHandle[] _cpuRegionHandles;
+        private readonly RegionHandle[] _cpuRegionHandles;
 
         public bool Dirty
         {
@@ -35,7 +34,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// Create a new GpuRegionHandle, made up of mulitple CpuRegionHandles.
         /// </summary>
         /// <param name="cpuRegionHandles">The CpuRegionHandles that make up this handle</param>
-        public GpuRegionHandle(CpuRegionHandle[] cpuRegionHandles)
+        public GpuRegionHandle(RegionHandle[] cpuRegionHandles)
         {
             _cpuRegionHandles = cpuRegionHandles;
         }

src/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs

@@ -1,5 +1,4 @@
 using Ryujinx.Cpu;
-using Ryujinx.Cpu.Tracking;
 using Ryujinx.Graphics.Gpu.Image;
 using Ryujinx.Graphics.Gpu.Shader;
 using Ryujinx.Memory;
@@ -348,7 +347,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="size">Size of the region</param>
         /// <param name="kind">Kind of the resource being tracked</param>
         /// <returns>The memory tracking handle</returns>
-        public CpuRegionHandle BeginTracking(ulong address, ulong size, ResourceKind kind)
+        public RegionHandle BeginTracking(ulong address, ulong size, ResourceKind kind)
         {
             return _cpuMemory.BeginTracking(address, size, (int)kind);
         }
@@ -361,7 +360,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <returns>The memory tracking handle</returns>
         public GpuRegionHandle BeginTracking(MultiRange range, ResourceKind kind)
         {
-            var cpuRegionHandles = new CpuRegionHandle[range.Count];
+            var cpuRegionHandles = new RegionHandle[range.Count];
             int count = 0;
 
             for (int i = 0; i < range.Count; i++)
@@ -390,7 +389,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="handles">Handles to inherit state from or reuse</param>
         /// <param name="granularity">Desired granularity of write tracking</param>
         /// <returns>The memory tracking handle</returns>
-        public CpuMultiRegionHandle BeginGranularTracking(ulong address, ulong size, ResourceKind kind, IEnumerable<IRegionHandle> handles = null, ulong granularity = 4096)
+        public MultiRegionHandle BeginGranularTracking(ulong address, ulong size, ResourceKind kind, IEnumerable<IRegionHandle> handles = null, ulong granularity = 4096)
         {
             return _cpuMemory.BeginGranularTracking(address, size, handles, granularity, (int)kind);
         }
@@ -403,7 +402,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="kind">Kind of the resource being tracked</param>
         /// <param name="granularity">Desired granularity of write tracking</param>
         /// <returns>The memory tracking handle</returns>
-        public CpuSmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ResourceKind kind, ulong granularity = 4096)
+        public SmartMultiRegionHandle BeginSmartGranularTracking(ulong address, ulong size, ResourceKind kind, ulong granularity = 4096)
         {
             return _cpuMemory.BeginSmartGranularTracking(address, size, granularity, (int)kind);
         }

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         private const ushort FileFormatVersionMajor = 1;
         private const ushort FileFormatVersionMinor = 2;
         private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
-        private const uint CodeGenVersion = 2237;
+        private const uint CodeGenVersion = 4821;
 
         private const string SharedTocFileName = "shared.toc";
         private const string SharedDataFileName = "shared.data";

src/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs

@@ -161,12 +161,12 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
             Operand addrLow,
             bool isStg16Or8)
         {
-            int baseAddressCbOffset = GetStorageCbOffset(config.Stage, storageIndex);
+            (int sbCbSlot, int sbCbOffset) = config.GetSbCbInfo(storageIndex);
 
             bool storageAligned = !(config.GpuAccessor.QueryHasUnalignedStorageBuffer() || config.GpuAccessor.QueryHostStorageBufferOffsetAlignment() > Constants.StorageAlignment);
 
             (Operand byteOffset, int constantOffset) = storageAligned ?
-                GetStorageOffset(block, Utils.FindLastOperation(addrLow, block), baseAddressCbOffset) :
+                GetStorageOffset(block, Utils.FindLastOperation(addrLow, block), sbCbSlot, sbCbOffset) :
                 (null, 0);
 
             if (byteOffset != null)
@@ -176,8 +176,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
 
             if (byteOffset == null)
             {
-                (int sbCbSlot, int sbCbOffset) = config.GetSbCbInfo(storageIndex);
-
                 Operand baseAddrLow = Cbuf(sbCbSlot, sbCbOffset);
                 Operand baseAddrTrunc = Local();
 
@@ -217,9 +215,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
             return wordOffset;
         }
 
-        private static bool IsCb0Offset(Operand operand, int offset)
+        private static bool IsCbOffset(Operand operand, int slot, int offset)
         {
-            return operand.Type == OperandType.ConstantBuffer && operand.GetCbufSlot() == 0 && operand.GetCbufOffset() == offset;
+            return operand.Type == OperandType.ConstantBuffer && operand.GetCbufSlot() == slot && operand.GetCbufOffset() == offset;
         }
 
         private static void ReplaceAddressAlignment(LinkedList<INode> list, Operand address, Operand byteOffset, int constantOffset)
@@ -263,9 +261,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
             }
         }
 
-        private static (Operand, int) GetStorageOffset(BasicBlock block, Operand address, int baseAddressCbOffset)
+        private static (Operand, int) GetStorageOffset(BasicBlock block, Operand address, int cbSlot, int baseAddressCbOffset)
         {
-            if (IsCb0Offset(address, baseAddressCbOffset))
+            if (IsCbOffset(address, cbSlot, baseAddressCbOffset))
             {
                 // Direct offset: zero.
                 return (Const(0), 0);
@@ -275,7 +273,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
 
             address = Utils.FindLastOperation(address, block);
 
-            if (IsCb0Offset(address, baseAddressCbOffset))
+            if (IsCbOffset(address, cbSlot, baseAddressCbOffset))
             {
                 // Only constant offset
                 return (Const(0), constantOffset);
@@ -289,11 +287,11 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
             Operand src1 = offsetAdd.GetSource(0);
             Operand src2 = Utils.FindLastOperation(offsetAdd.GetSource(1), block);
 
-            if (IsCb0Offset(src2, baseAddressCbOffset))
+            if (IsCbOffset(src2, cbSlot, baseAddressCbOffset))
             {
                 return (src1, constantOffset);
             }
-            else if (IsCb0Offset(src1, baseAddressCbOffset))
+            else if (IsCbOffset(src1, cbSlot, baseAddressCbOffset))
             {
                 return (src2, constantOffset);
             }

src/Ryujinx.Memory/Tracking/RegionHandle.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection.Metadata;
 using System.Threading;
 
 namespace Ryujinx.Memory.Tracking
@@ -443,6 +444,16 @@ namespace Ryujinx.Memory.Tracking
             return Address < address + size && address < EndAddress;
         }
 
+        /// <summary>
+        /// Determines if this handle's memory range matches another exactly.
+        /// </summary>
+        /// <param name="other">The other handle</param>
+        /// <returns>True on a match, false otherwise</returns>
+        public bool RangeEquals(RegionHandle other)
+        {
+            return RealAddress == other.RealAddress && RealSize == other.RealSize;
+        }
+
         /// <summary>
         /// Dispose the handle. Within the tracking lock, this removes references from virtual regions.
         /// </summary>

src/Ryujinx/Ui/Widgets/GameTableContextMenu.cs

@@ -270,8 +270,14 @@ namespace Ryujinx.Ui.Widgets
 
                         int index = Nca.GetSectionIndexFromType(ncaSectionType, mainNca.Header.ContentType);
 
-                        IFileSystem ncaFileSystem = patchNca != null ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
-                                                                     : mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
+                        bool sectionExistsInPatch = false;
+                        if (patchNca != null)
+                        {
+                            sectionExistsInPatch = patchNca.CanOpenSection(index);
+                        }
+
+                        IFileSystem ncaFileSystem = sectionExistsInPatch ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
+                                                                         : mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
 
                         FileSystemClient fsClient = _horizonClient.Fs;
 

src/Ryujinx/Ui/Windows/DlcWindow.glade

@@ -89,7 +89,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Adds an update to this list</property>
+                    <property name="tooltip_text" translatable="yes">Adds a DLC to this list</property>
                     <property name="margin_left">10</property>
                     <signal name="clicked" handler="AddButton_Clicked" swapped="no"/>
                   </object>
@@ -105,7 +105,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Removes the selected update</property>
+                    <property name="tooltip_text" translatable="yes">Removes the selected DLC</property>
                     <property name="margin_left">10</property>
                     <signal name="clicked" handler="RemoveButton_Clicked" swapped="no"/>
                   </object>
@@ -121,7 +121,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Removes the selected update</property>
+                    <property name="tooltip_text" translatable="yes">Removes all DLCs</property>
                     <property name="margin_left">10</property>
                     <signal name="clicked" handler="RemoveAllButton_Clicked" swapped="no"/>
                   </object>

src/Ryujinx/Ui/Windows/TitleUpdateWindow.glade

@@ -133,7 +133,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Removes the selected update</property>
+                    <property name="tooltip_text" translatable="yes">Removes all the updates</property>
                     <property name="margin_left">10</property>
                     <signal name="clicked" handler="RemoveAllButton_Clicked" swapped="no"/>
                   </object>