vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy 16 bytes at a time for layout conversion, if possible

Browse Source
This commit is contained in:
gdkchan 2019-12-11 16:43:28 -03:00 committed by Thog
parent cfe5fec0cf
commit 1a550e810c
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Ryujinx.Graphics.Texture/BlockLinearLayout.cs
View File

@ -1,5 +1,5 @@
using Ryujinx.Common; using Ryujinx.Common;
using System; using System.Runtime.CompilerServices;
using static Ryujinx.Graphics.Texture.BlockLinearConstants; using static Ryujinx.Graphics.Texture.BlockLinearConstants;
@ -19,11 +19,6 @@ namespace Ryujinx.Graphics.Texture
} }
} }
private int _texWidth;
private int _texHeight;
private int _texDepth;
private int _texGobBlocksInY;
private int _texGobBlocksInZ;
private int _texBpp; private int _texBpp;
private int _bhMask; private int _bhMask;
@ -46,12 +41,7 @@ namespace Ryujinx.Graphics.Texture
int gobBlocksInZ, int gobBlocksInZ,
int bpp) int bpp)
{ {
_texWidth = width; _texBpp = bpp;
_texHeight = height;
_texDepth = depth;
_texGobBlocksInY = gobBlocksInY;
_texGobBlocksInZ = gobBlocksInZ;
_texBpp = bpp;
_bppShift = BitUtils.CountTrailingZeros32(bpp); _bppShift = BitUtils.CountTrailingZeros32(bpp);
@ -80,27 +70,32 @@ namespace Ryujinx.Graphics.Texture
return new RobAndSliceSizes(robSize, sliceSize); return new RobAndSliceSizes(robSize, sliceSize);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int GetOffset(int x, int y, int z) public int GetOffset(int x, int y, int z)
{ {
x <<= _bppShift; return GetOffsetWithLineOffset(x << _bppShift, y, z);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int GetOffsetWithLineOffset(int x, int y, int z)
{
int yh = y / GobHeight; int yh = y / GobHeight;
int position = (z >> _bdShift) * _sliceSize + (yh >> _bhShift) * _robSize; int offset = (z >> _bdShift) * _sliceSize + (yh >> _bhShift) * _robSize;
position += (x / GobStride) << _xShift; offset += (x / GobStride) << _xShift;
position += (yh & _bhMask) * GobSize; offset += (yh & _bhMask) * GobSize;
position += ((z & _bdMask) * GobSize) << _bhShift; offset += ((z & _bdMask) * GobSize) << _bhShift;
position += ((x & 0x3f) >> 5) << 8; offset += ((x & 0x3f) >> 5) << 8;
position += ((y & 0x07) >> 1) << 6; offset += ((y & 0x07) >> 1) << 6;
position += ((x & 0x1f) >> 4) << 5; offset += ((x & 0x1f) >> 4) << 5;
position += ((y & 0x01) >> 0) << 4; offset += ((y & 0x01) >> 0) << 4;
position += ((x & 0x0f) >> 0) << 0; offset += ((x & 0x0f) >> 0) << 0;
return position; return offset;
} }
} }
} }

15
Ryujinx.Graphics.Texture/LayoutConverter.cs
View File

@ -62,6 +62,10 @@ namespace Ryujinx.Graphics.Texture
mipGobBlocksInZ >>= 1; mipGobBlocksInZ >>= 1;
} }
int strideTrunc = BitUtils.AlignDown(w * bytesPerPixel, 16);
int xStart = strideTrunc / bytesPerPixel;
int stride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment); int stride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment);
int wAligned = BitUtils.AlignUp(w, wAlignment); int wAligned = BitUtils.AlignUp(w, wAlignment);
@ -80,7 +84,16 @@ namespace Ryujinx.Graphics.Texture
for (int z = 0; z < d; z++) for (int z = 0; z < d; z++)
for (int y = 0; y < h; y++) for (int y = 0; y < h; y++)
{ {
for (int x = 0; x < w; x++) for (int x = 0; x < strideTrunc; x += 16)
{
int offset = inBaseOffset + layoutConverter.GetOffsetWithLineOffset(x, y, z);
Span<byte> dest = output.Slice(outOffs + x, 16);
data.Slice(offset, 16).CopyTo(dest);
}
for (int x = xStart; x < w; x++)
{ {
int offset = inBaseOffset + layoutConverter.GetOffset(x, y, z); int offset = inBaseOffset + layoutConverter.GetOffset(x, y, z);