diff options
Diffstat (limited to 'Ryujinx.Graphics')
| -rw-r--r-- | Ryujinx.Graphics/Memory/NvGpuVmm.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.Graphics/Memory/NvGpuVmmCache.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Graphics/Texture/ImageUtils.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.Graphics/Texture/TextureHelper.cs | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/Ryujinx.Graphics/Memory/NvGpuVmm.cs b/Ryujinx.Graphics/Memory/NvGpuVmm.cs index 0082fb27..ec660bf0 100644 --- a/Ryujinx.Graphics/Memory/NvGpuVmm.cs +++ b/Ryujinx.Graphics/Memory/NvGpuVmm.cs @@ -4,7 +4,7 @@ using System; namespace Ryujinx.Graphics.Memory { - public class NvGpuVmm : IAMemory, IGalMemory + public class NvGpuVmm : IMemory, IGalMemory { public const long AddrSize = 1L << 40; @@ -23,7 +23,7 @@ namespace Ryujinx.Graphics.Memory private const int PTLvl0Bit = PTPageBits + PTLvl1Bits; private const int PTLvl1Bit = PTPageBits; - public AMemory Memory { get; private set; } + public MemoryManager Memory { get; private set; } private NvGpuVmmCache Cache; @@ -32,7 +32,7 @@ namespace Ryujinx.Graphics.Memory private long[][] PageTable; - public NvGpuVmm(AMemory Memory) + public NvGpuVmm(MemoryManager Memory) { this.Memory = Memory; diff --git a/Ryujinx.Graphics/Memory/NvGpuVmmCache.cs b/Ryujinx.Graphics/Memory/NvGpuVmmCache.cs index f1c16a36..57e25a2f 100644 --- a/Ryujinx.Graphics/Memory/NvGpuVmmCache.cs +++ b/Ryujinx.Graphics/Memory/NvGpuVmmCache.cs @@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Memory CachedRanges = new ValueRangeSet<int>(); } - public bool IsRegionModified(AMemory Memory, NvGpuBufferType BufferType, long PA, long Size) + public bool IsRegionModified(MemoryManager Memory, NvGpuBufferType BufferType, long PA, long Size) { (bool[] Modified, long ModifiedCount) = Memory.IsRegionModified(PA, Size); diff --git a/Ryujinx.Graphics/Texture/ImageUtils.cs b/Ryujinx.Graphics/Texture/ImageUtils.cs index d2172c2e..97da17a0 100644 --- a/Ryujinx.Graphics/Texture/ImageUtils.cs +++ b/Ryujinx.Graphics/Texture/ImageUtils.cs @@ -216,9 +216,9 @@ namespace Ryujinx.Graphics.Texture throw new NotImplementedException(Format.ToString()); } - public static byte[] ReadTexture(IAMemory Memory, GalImage Image, long Position) + public static byte[] ReadTexture(IMemory Memory, GalImage Image, long Position) { - AMemory CpuMemory; + MemoryManager CpuMemory; if (Memory is NvGpuVmm Vmm) { @@ -226,7 +226,7 @@ namespace Ryujinx.Graphics.Texture } else { - CpuMemory = (AMemory)Memory; + CpuMemory = (MemoryManager)Memory; } ISwizzle Swizzle = TextureHelper.GetSwizzle(Image); diff --git a/Ryujinx.Graphics/Texture/TextureHelper.cs b/Ryujinx.Graphics/Texture/TextureHelper.cs index 9e966e6b..6ac91d8b 100644 --- a/Ryujinx.Graphics/Texture/TextureHelper.cs +++ b/Ryujinx.Graphics/Texture/TextureHelper.cs @@ -27,16 +27,16 @@ namespace Ryujinx.Graphics.Texture } } - public static (AMemory Memory, long Position) GetMemoryAndPosition( - IAMemory Memory, - long Position) + public static (MemoryManager Memory, long Position) GetMemoryAndPosition( + IMemory Memory, + long Position) { if (Memory is NvGpuVmm Vmm) { return (Vmm.Memory, Vmm.GetPhysicalAddress(Position)); } - return ((AMemory)Memory, Position); + return ((MemoryManager)Memory, Position); } } } |