mirrors/ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Texture Sync, incompatible overlap handling, data flush improvements. (#2971)

Browse source 
* 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
This commit is contained in:
riperiperi 2022-01-09 16:28:48 +00:00 • committed by GitHub
parent 4864648e72
commit cda659955c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 1453 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ryujinx.Graphics.Texture/LayoutConverter.cs
View file

@ -97,6 +97,7 @@ namespace Ryujinx.Graphics.Texture
int width,
int height,
int depth,
int sliceDepth,
int levels,
int layers,
int blockWidth,
@ -172,6 +173,8 @@ namespace Ryujinx.Graphics.Texture
mipGobBlocksInZ,
bytesPerPixel);
int sd = Math.Max(1, sliceDepth >> level);
unsafe bool Convert<T>(Span<byte> output, ReadOnlySpan<byte> data) where T : unmanaged
{
fixed (byte* outputPtr = output, dataPtr = data)
@ -181,7 +184,7 @@ namespace Ryujinx.Graphics.Texture
{
byte* inBaseOffset = dataPtr + (layer * sizeInfo.LayerSize + sizeInfo.GetMipOffset(level));
for (int z = 0; z < d; z++)
for (int z = 0; z < sd; z++)
{
layoutConverter.SetZ(z);
for (int y = 0; y < h; y++)
@ -364,6 +367,7 @@ namespace Ryujinx.Graphics.Texture
int width,
int height,
int depth,
int sliceDepth,
int levels,
int layers,
int blockWidth,
@ -432,6 +436,8 @@ namespace Ryujinx.Graphics.Texture
mipGobBlocksInZ,
bytesPerPixel);
int sd = Math.Max(1, sliceDepth >> level);
unsafe bool Convert<T>(Span<byte> output, ReadOnlySpan<byte> data) where T : unmanaged
{
fixed (byte* outputPtr = output, dataPtr = data)
@ -441,7 +447,7 @@ namespace Ryujinx.Graphics.Texture
{
byte* outBaseOffset = outputPtr + (layer * sizeInfo.LayerSize + sizeInfo.GetMipOffset(level));
for (int z = 0; z < d; z++)
for (int z = 0; z < sd; z++)
{
layoutConverter.SetZ(z);
for (int y = 0; y < h; y++)

6
Ryujinx.Graphics.Texture/SizeCalculator.cs
View file

@ -43,6 +43,7 @@ namespace Ryujinx.Graphics.Texture
int[] allOffsets = new int[is3D ? Calculate3DOffsetCount(levels, depth) : levels * layers * depth];
int[] mipOffsets = new int[levels];
int[] sliceSizes = new int[levels];
int[] levelSizes = new int[levels];
int mipGobBlocksInY = gobBlocksInY;
int mipGobBlocksInZ = gobBlocksInZ;
@ -108,8 +109,9 @@ namespace Ryujinx.Graphics.Texture
mipOffsets[level] = layerSize;
sliceSizes[level] = totalBlocksOfGobsInY * robSize;
levelSizes[level] = totalBlocksOfGobsInZ * sliceSizes[level];
layerSize += totalBlocksOfGobsInZ * sliceSizes[level];
layerSize += levelSizes[level];
depthLevelOffset += d;
}
@ -152,7 +154,7 @@ namespace Ryujinx.Graphics.Texture
}
}
return new SizeInfo(mipOffsets, allOffsets, sliceSizes, depth, levels, layerSize, totalSize, is3D);
return new SizeInfo(mipOffsets, allOffsets, sliceSizes, levelSizes, depth, levels, layerSize, totalSize, is3D);
}
public static SizeInfo GetLinearTextureSize(int stride, int height, int blockHeight)

7
Ryujinx.Graphics.Texture/SizeInfo.cs
View file

@ -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