diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2023-12-04 16:30:19 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-04 20:30:19 +0100 |
| commit | 1df6c07f78c4c3b8c7fc679d7466f79a10c2d496 (patch) | |
| tree | b80d247e199503274054259cb2707f44cc072993 /src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs | |
| parent | 0531c16326c8215bff1c0a98f3ed217f01065446 (diff) | |
Implement support for multi-range buffers using Vulkan sparse mappings (#5427)1.1.1098
* Pass MultiRange to BufferManager
* Implement support for multi-range buffers using Vulkan sparse mappings
* Use multi-range for remaining buffers, delete old methods
* Assume that more buffers are contiguous
* Dispose multi-range buffers after they are removed from the list
* Properly init BufferBounds for constant and storage buffers
* Do not try reading zero bytes data from an unmapped address on the shader cache + PR feedback
* Fix misaligned sparse buffer offsets
* Null check can be simplified
* PR feedback
Diffstat (limited to 'src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs index 38be262a..af682e42 100644 --- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs +++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs @@ -730,8 +730,8 @@ namespace Ryujinx.Graphics.Gpu.Shader codeA ??= memoryManager.GetSpan(vertexA.Address, vertexA.Size).ToArray(); codeB ??= memoryManager.GetSpan(currentStage.Address, currentStage.Size).ToArray(); - byte[] cb1DataA = memoryManager.Physical.GetSpan(cb1DataAddress, vertexA.Cb1DataSize).ToArray(); - byte[] cb1DataB = memoryManager.Physical.GetSpan(cb1DataAddress, currentStage.Cb1DataSize).ToArray(); + byte[] cb1DataA = ReadArray(memoryManager, cb1DataAddress, vertexA.Cb1DataSize); + byte[] cb1DataB = ReadArray(memoryManager, cb1DataAddress, currentStage.Cb1DataSize); ShaderDumpPaths pathsA = default; ShaderDumpPaths pathsB = default; @@ -770,7 +770,7 @@ namespace Ryujinx.Graphics.Gpu.Shader ? channel.BufferManager.GetComputeUniformBufferAddress(1) : channel.BufferManager.GetGraphicsUniformBufferAddress(StageToStageIndex(context.Stage), 1); - byte[] cb1Data = memoryManager.Physical.GetSpan(cb1DataAddress, context.Cb1DataSize).ToArray(); + byte[] cb1Data = ReadArray(memoryManager, cb1DataAddress, context.Cb1DataSize); code ??= memoryManager.GetSpan(context.Address, context.Size).ToArray(); ShaderDumpPaths paths = dumper?.Dump(code, context.Stage == ShaderStage.Compute) ?? default; @@ -782,6 +782,23 @@ namespace Ryujinx.Graphics.Gpu.Shader } /// <summary> + /// Reads data from physical memory, returns an empty array if the memory is unmapped or size is 0. + /// </summary> + /// <param name="memoryManager">Memory manager with the physical memory to read from</param> + /// <param name="address">Physical address of the region to read</param> + /// <param name="size">Size in bytes of the data</param> + /// <returns>An array with the data at the specified memory location</returns> + private static byte[] ReadArray(MemoryManager memoryManager, ulong address, int size) + { + if (address == MemoryManager.PteUnmapped || size == 0) + { + return Array.Empty<byte>(); + } + + return memoryManager.Physical.GetSpan(address, size).ToArray(); + } + + /// <summary> /// Gets the index of a stage from a <see cref="ShaderStage"/>. /// </summary> /// <param name="stage">Stage to get the index from</param> |