diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2022-01-09 16:28:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 13:28:48 -0300 |
| commit | cda659955ced1b16839cdd1e7fea1ef6f8d99041 (patch) | |
| tree | 41d0d7a705f9feb7b43c9e5bac14dafee7878220 /Ryujinx.Graphics.Texture/SizeInfo.cs | |
| parent | 4864648e727c6f526e3b65478f222c15468f6074 (diff) | |
Texture Sync, incompatible overlap handling, data flush improvements. (#2971)
* Initial test for texture sync
* WIP new texture flushing setup
* Improve rules for incompatible overlaps
Fixes a lot of issues with Unreal Engine games. Still a few minor issues (some caused by dma fast path?) Needs docs and cleanup.
* Cleanup, improvements
Improve rules for fast DMA
* Small tweak to group together flushes of overlapping handles.
* Fixes, flush overlapping texture data for ASTC and BC4/5 compressed textures.
Fixes the new Life is Strange game.
* Flush overlaps before init data, fix 3d texture size/overlap stuff
* Fix 3D Textures, faster single layer flush
Note: nosy people can no longer merge this with Vulkan. (unless they are nosy enough to implement the new backend methods)
* Remove unused method
* Minor cleanup
* More cleanup
* Use the More Fun and Hopefully No Driver Bugs method for getting compressed tex too
This one's for metro
* Address feedback, ASTC+ETC to FormatClass
* Change offset to use Span slice rather than IntPtr Add
* Fix this too
Diffstat (limited to 'Ryujinx.Graphics.Texture/SizeInfo.cs')
| -rw-r--r-- | Ryujinx.Graphics.Texture/SizeInfo.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Ryujinx.Graphics.Texture/SizeInfo.cs b/Ryujinx.Graphics.Texture/SizeInfo.cs index 880d677b..ed5379b3 100644 --- a/Ryujinx.Graphics.Texture/SizeInfo.cs +++ b/Ryujinx.Graphics.Texture/SizeInfo.cs @@ -13,6 +13,7 @@ namespace Ryujinx.Graphics.Texture public readonly int[] AllOffsets; public readonly int[] SliceSizes; + public readonly int[] LevelSizes; public int LayerSize { get; } public int TotalSize { get; } @@ -21,6 +22,7 @@ namespace Ryujinx.Graphics.Texture _mipOffsets = new int[] { 0 }; AllOffsets = new int[] { 0 }; SliceSizes = new int[] { size }; + LevelSizes = new int[] { size }; _depth = 1; _levels = 1; LayerSize = size; @@ -32,6 +34,7 @@ namespace Ryujinx.Graphics.Texture int[] mipOffsets, int[] allOffsets, int[] sliceSizes, + int[] levelSizes, int depth, int levels, int layerSize, @@ -41,6 +44,7 @@ namespace Ryujinx.Graphics.Texture _mipOffsets = mipOffsets; AllOffsets = allOffsets; SliceSizes = sliceSizes; + LevelSizes = levelSizes; _depth = depth; _levels = levels; LayerSize = layerSize; @@ -99,7 +103,8 @@ namespace Ryujinx.Graphics.Texture { for (int i = 0; i < _mipOffsets.Length; i++) { - yield return new Region(_mipOffsets[i], SliceSizes[i]); + int maxSize = TotalSize - _mipOffsets[i]; + yield return new Region(_mipOffsets[i], Math.Min(maxSize, LevelSizes[i])); } } else |
