mirrors/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-19 11:26:45 +00:00
Code Issues Releases Activity

Fix buffer to texture copy with remap enabled (#1721)

Browse source
This commit is contained in:
gdkchan 2020-11-17 19:06:02 -03:00 committed by GitHub
parent d636e3748d
commit 5189a807c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs
View file

@ -2,6 +2,7 @@ using Ryujinx.Common;
using Ryujinx.Graphics.Gpu.State; using Ryujinx.Graphics.Gpu.State;
using Ryujinx.Graphics.Texture; using Ryujinx.Graphics.Texture;
using System; using System;
using System.Runtime.Intrinsics;
namespace Ryujinx.Graphics.Gpu.Engine namespace Ryujinx.Graphics.Gpu.Engine
{ {
@ -10,27 +11,38 @@ namespace Ryujinx.Graphics.Gpu.Engine
private const int StrideAlignment = 32; private const int StrideAlignment = 32;
private const int GobAlignment = 64; private const int GobAlignment = 64;
enum CopyFlags
{
SrcLinear = 1 << 7,
DstLinear = 1 << 8,
MultiLineEnable = 1 << 9,
RemapEnable = 1 << 10
}
/// <summary> /// <summary>
/// Determine if a buffer-to-texture region covers the entirety of a texture. /// Determine if a buffer-to-texture region covers the entirety of a texture.
/// </summary> /// </summary>
/// <param name="cbp">Copy command parameters</param> /// <param name="cbp">Copy command parameters</param>
/// <param name="tex">Texture to compare</param> /// <param name="tex">Texture to compare</param>
/// <param name="linear">True if the texture is linear, false if block linear</param> /// <param name="linear">True if the texture is linear, false if block linear</param>
/// <param name="bpp">Texture bytes per pixel</param>
/// <param name="stride">Texture stride</param> /// <param name="stride">Texture stride</param>
/// <returns></returns> /// <returns></returns>
private bool IsTextureCopyComplete(CopyBufferParams cbp, CopyBufferTexture tex, bool linear, int stride) private bool IsTextureCopyComplete(CopyBufferParams cbp, CopyBufferTexture tex, bool linear, int bpp, int stride)
{ {
if (linear) if (linear)
{ {
int alignWidth = StrideAlignment / bpp;
return tex.RegionX == 0 && return tex.RegionX == 0 &&
tex.RegionY == 0 && tex.RegionY == 0 &&
stride == BitUtils.AlignUp(cbp.XCount, StrideAlignment); stride / bpp == BitUtils.AlignUp(cbp.XCount, alignWidth);
} }
else else
{ {
int alignWidth = GobAlignment / bpp;
return tex.RegionX == 0 && return tex.RegionX == 0 &&
tex.RegionY == 0 && tex.RegionY == 0 &&
tex.Width == BitUtils.AlignUp(cbp.XCount, GobAlignment) && tex.Width == BitUtils.AlignUp(cbp.XCount, alignWidth) &&
tex.Height == cbp.YCount; tex.Height == cbp.YCount;
} }
} }
@ -46,9 +58,12 @@ namespace Ryujinx.Graphics.Gpu.Engine
var swizzle = state.Get<CopyBufferSwizzle>(MethodOffset.CopyBufferSwizzle); var swizzle = state.Get<CopyBufferSwizzle>(MethodOffset.CopyBufferSwizzle);
bool srcLinear = (argument & (1 << 7)) != 0; CopyFlags copyFlags = (CopyFlags)argument;
bool dstLinear = (argument & (1 << 8)) != 0;
bool copy2D = (argument & (1 << 9)) != 0; bool srcLinear = copyFlags.HasFlag(CopyFlags.SrcLinear);
bool dstLinear = copyFlags.HasFlag(CopyFlags.DstLinear);
bool copy2D = copyFlags.HasFlag(CopyFlags.MultiLineEnable);
bool remap = copyFlags.HasFlag(CopyFlags.RemapEnable);
int size = cbp.XCount; int size = cbp.XCount;
@ -60,6 +75,9 @@ namespace Ryujinx.Graphics.Gpu.Engine
if (copy2D) if (copy2D)
{ {
// Buffer to texture copy. // Buffer to texture copy.
int srcBpp = remap ? swizzle.UnpackSrcComponentsCount() * swizzle.UnpackComponentSize() : 1;
int dstBpp = remap ? swizzle.UnpackDstComponentsCount() * swizzle.UnpackComponentSize() : 1;
var dst = state.Get<CopyBufferTexture>(MethodOffset.CopyBufferDstTexture); var dst = state.Get<CopyBufferTexture>(MethodOffset.CopyBufferDstTexture);
var src = state.Get<CopyBufferTexture>(MethodOffset.CopyBufferSrcTexture); var src = state.Get<CopyBufferTexture>(MethodOffset.CopyBufferSrcTexture);
@ -70,7 +88,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
srcLinear, srcLinear,
src.MemoryLayout.UnpackGobBlocksInY(), src.MemoryLayout.UnpackGobBlocksInY(),
src.MemoryLayout.UnpackGobBlocksInZ(), src.MemoryLayout.UnpackGobBlocksInZ(),
1); srcBpp);
var dstCalculator = new OffsetCalculator( var dstCalculator = new OffsetCalculator(
dst.Width, dst.Width,
@ -79,7 +97,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
dstLinear, dstLinear,
dst.MemoryLayout.UnpackGobBlocksInY(), dst.MemoryLayout.UnpackGobBlocksInY(),
dst.MemoryLayout.UnpackGobBlocksInZ(), dst.MemoryLayout.UnpackGobBlocksInZ(),
1); dstBpp);
ulong srcBaseAddress = _context.MemoryManager.Translate(cbp.SrcAddress.Pack()); ulong srcBaseAddress = _context.MemoryManager.Translate(cbp.SrcAddress.Pack());
ulong dstBaseAddress = _context.MemoryManager.Translate(cbp.DstAddress.Pack()); ulong dstBaseAddress = _context.MemoryManager.Translate(cbp.DstAddress.Pack());
@ -90,8 +108,8 @@ namespace Ryujinx.Graphics.Gpu.Engine
ReadOnlySpan<byte> srcSpan = _context.PhysicalMemory.GetSpan(srcBaseAddress + (ulong)srcBaseOffset, srcSize, true); ReadOnlySpan<byte> srcSpan = _context.PhysicalMemory.GetSpan(srcBaseAddress + (ulong)srcBaseOffset, srcSize, true);
Span<byte> dstSpan = _context.PhysicalMemory.GetSpan(dstBaseAddress + (ulong)dstBaseOffset, dstSize).ToArray(); Span<byte> dstSpan = _context.PhysicalMemory.GetSpan(dstBaseAddress + (ulong)dstBaseOffset, dstSize).ToArray();
bool completeSource = IsTextureCopyComplete(cbp, src, srcLinear, cbp.SrcStride); bool completeSource = IsTextureCopyComplete(cbp, src, srcLinear, srcBpp, cbp.SrcStride);
bool completeDest = IsTextureCopyComplete(cbp, dst, dstLinear, cbp.DstStride); bool completeDest = IsTextureCopyComplete(cbp, dst, dstLinear, dstBpp, cbp.DstStride);
if (completeSource && completeDest) if (completeSource && completeDest)
{ {
@ -120,7 +138,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
1, 1,
1, 1,
1, 1,
1, srcBpp,
src.MemoryLayout.UnpackGobBlocksInY(), src.MemoryLayout.UnpackGobBlocksInY(),
src.MemoryLayout.UnpackGobBlocksInZ(), src.MemoryLayout.UnpackGobBlocksInZ(),
1, 1,
@ -167,7 +185,16 @@ namespace Ryujinx.Graphics.Gpu.Engine
return true; return true;
} }
Convert<byte>(dstSpan, srcSpan); bool _ = srcBpp switch
{
1 => Convert<byte>(dstSpan, srcSpan),
2 => Convert<ushort>(dstSpan, srcSpan),
4 => Convert<uint>(dstSpan, srcSpan),
8 => Convert<ulong>(dstSpan, srcSpan),
12 => Convert<Bpp12Pixel>(dstSpan, srcSpan),
16 => Convert<Vector128<byte>>(dstSpan, srcSpan),
_ => throw new NotSupportedException($"Unable to copy ${srcBpp} bpp pixel format.")
};
_context.PhysicalMemory.Write(dstBaseAddress + (ulong)dstBaseOffset, dstSpan); _context.PhysicalMemory.Write(dstBaseAddress + (ulong)dstBaseOffset, dstSpan);
} }