diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2020-07-25 03:39:45 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-25 16:39:45 +1000 |
| commit | 111534a74e77664c2ab64c23e74d2173d6029b01 (patch) | |
| tree | bb3a59b65759f1c2a45f35148628dad4009b2c46 /Ryujinx.Graphics.Gpu/Shader | |
| parent | 80d4199fb381a544786a6447adca998561d737dc (diff) | |
Remove GPU MemoryAccessor (#1423)
* Remove GPU MemoryAccessor
* Update outdated XML doc
* Update more outdated stuff
Diffstat (limited to 'Ryujinx.Graphics.Gpu/Shader')
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs b/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs index 2774b7d1..7c712a0f 100644 --- a/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs +++ b/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs @@ -81,7 +81,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// <returns>Data at the memory location</returns> public T MemoryRead<T>(ulong address) where T : unmanaged { - return _context.MemoryAccessor.Read<T>(address); + return _context.MemoryManager.Read<T>(address); } /// <summary> diff --git a/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs b/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs index d16f1057..ab777162 100644 --- a/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs +++ b/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs @@ -262,13 +262,13 @@ namespace Ryujinx.Graphics.Gpu.Shader return true; } - ReadOnlySpan<byte> memoryCode = _context.MemoryAccessor.GetSpan(gpuVa, shader.Code.Length); + ReadOnlySpan<byte> memoryCode = _context.MemoryManager.GetSpan(gpuVa, shader.Code.Length); bool equals = memoryCode.SequenceEqual(shader.Code); if (equals && shader.Code2 != null) { - memoryCode = _context.MemoryAccessor.GetSpan(gpuVaA, shader.Code2.Length); + memoryCode = _context.MemoryManager.GetSpan(gpuVaA, shader.Code2.Length); equals = memoryCode.SequenceEqual(shader.Code2); } @@ -307,7 +307,7 @@ namespace Ryujinx.Graphics.Gpu.Shader program = Translator.Translate(gpuVa, gpuAccessor, DefaultFlags | TranslationFlags.Compute); - byte[] code = _context.MemoryAccessor.ReadBytes(gpuVa, program.Size); + byte[] code = _context.MemoryManager.GetSpan(gpuVa, program.Size).ToArray(); _dumper.Dump(code, compute: true, out string fullPath, out string codePath); @@ -344,8 +344,8 @@ namespace Ryujinx.Graphics.Gpu.Shader { ShaderProgram program = Translator.Translate(gpuVaA, gpuVa, gpuAccessor, DefaultFlags); - byte[] codeA = _context.MemoryAccessor.ReadBytes(gpuVaA, program.SizeA); - byte[] codeB = _context.MemoryAccessor.ReadBytes(gpuVa, program.Size); + byte[] codeA = _context.MemoryManager.GetSpan(gpuVaA, program.SizeA).ToArray(); + byte[] codeB = _context.MemoryManager.GetSpan(gpuVa, program.Size).ToArray(); _dumper.Dump(codeA, compute: false, out string fullPathA, out string codePathA); _dumper.Dump(codeB, compute: false, out string fullPathB, out string codePathB); @@ -364,7 +364,7 @@ namespace Ryujinx.Graphics.Gpu.Shader { ShaderProgram program = Translator.Translate(gpuVa, gpuAccessor, DefaultFlags); - byte[] code = _context.MemoryAccessor.ReadBytes(gpuVa, program.Size); + byte[] code = _context.MemoryManager.GetSpan(gpuVa, program.Size).ToArray(); _dumper.Dump(code, compute: false, out string fullPath, out string codePath); |
