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

Fix buffer to 3D texture copy (#1354)

Browse Source
This commit is contained in:
gdkchan 2020-07-03 20:37:36 -03:00 committed by GitHub
parent bf87f02c0c
commit 76e5af967a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs
View File

@ -44,6 +44,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
cbp.SrcStride, cbp.SrcStride,
srcLinear, srcLinear,
src.MemoryLayout.UnpackGobBlocksInY(), src.MemoryLayout.UnpackGobBlocksInY(),
src.MemoryLayout.UnpackGobBlocksInZ(),
srcBpp); srcBpp);
var dstCalculator = new OffsetCalculator( var dstCalculator = new OffsetCalculator(
@ -52,6 +53,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
cbp.DstStride, cbp.DstStride,
dstLinear, dstLinear,
dst.MemoryLayout.UnpackGobBlocksInY(), dst.MemoryLayout.UnpackGobBlocksInY(),
dst.MemoryLayout.UnpackGobBlocksInZ(),
dstBpp); dstBpp);
ulong srcBaseAddress = _context.MemoryManager.Translate(cbp.SrcAddress.Pack()); ulong srcBaseAddress = _context.MemoryManager.Translate(cbp.SrcAddress.Pack());
@ -70,7 +72,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
{ {
srcSpan.CopyTo(dstSpan); // No layout conversion has to be performed, just copy the data entirely. srcSpan.CopyTo(dstSpan); // No layout conversion has to be performed, just copy the data entirely.
} }
else else
{ {
unsafe bool Convert<T>(Span<byte> dstSpan, ReadOnlySpan<byte> srcSpan) where T : unmanaged unsafe bool Convert<T>(Span<byte> dstSpan, ReadOnlySpan<byte> srcSpan) where T : unmanaged
{ {

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

@ -41,7 +41,6 @@ namespace Ryujinx.Graphics.Texture
public BlockLinearLayout( public BlockLinearLayout(
int width, int width,
int height, int height,
int depth,
int gobBlocksInY, int gobBlocksInY,
int gobBlocksInZ, int gobBlocksInZ,
int bpp) int bpp)

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

@ -84,7 +84,6 @@ namespace Ryujinx.Graphics.Texture
BlockLinearLayout layoutConverter = new BlockLinearLayout( BlockLinearLayout layoutConverter = new BlockLinearLayout(
wAligned, wAligned,
h, h,
d,
mipGobBlocksInY, mipGobBlocksInY,
mipGobBlocksInZ, mipGobBlocksInZ,
bytesPerPixel); bytesPerPixel);
@ -256,7 +255,6 @@ namespace Ryujinx.Graphics.Texture
BlockLinearLayout layoutConverter = new BlockLinearLayout( BlockLinearLayout layoutConverter = new BlockLinearLayout(
wAligned, wAligned,
h, h,
d,
mipGobBlocksInY, mipGobBlocksInY,
mipGobBlocksInZ, mipGobBlocksInZ,
bytesPerPixel); bytesPerPixel);

14
Ryujinx.Graphics.Texture/OffsetCalculator.cs
View File

@ -23,6 +23,7 @@ namespace Ryujinx.Graphics.Texture
int stride, int stride,
bool isLinear, bool isLinear,
int gobBlocksInY, int gobBlocksInY,
int gobBlocksInZ,
int bytesPerPixel) int bytesPerPixel)
{ {
_width = width; _width = width;
@ -40,13 +41,22 @@ namespace Ryujinx.Graphics.Texture
_layoutConverter = new BlockLinearLayout( _layoutConverter = new BlockLinearLayout(
wAligned, wAligned,
height, height,
1,
gobBlocksInY, gobBlocksInY,
1, gobBlocksInZ,
bytesPerPixel); bytesPerPixel);
} }
} }
public OffsetCalculator(
int width,
int height,
int stride,
bool isLinear,
int gobBlocksInY,
int bytesPerPixel) : this(width, height, stride, isLinear, gobBlocksInY, 1, bytesPerPixel)
{
}
public void SetY(int y) public void SetY(int y)
{ {
if (_isLinear) if (_isLinear)