N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve dma copies on the gpu

Browse source
This commit is contained in:
gdkchan 2018-08-14 15:47:43 -03:00
parent 17f54b5d78
commit 6e4f43446b
3 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChocolArm64/Memory/AMemory.cs
View file

@ -691,6 +691,19 @@ namespace ChocolArm64.Memory
Marshal.Copy(Data, 0, (IntPtr)(RamPtr + (uint)Position), Data.Length); Marshal.Copy(Data, 0, (IntPtr)(RamPtr + (uint)Position), Data.Length);
} }
public void CopyBytes(long Src, long Dst, long Size)
{
EnsureRangeIsValid(Src, Size, AMemoryPerm.Read);
EnsureRangeIsValid(Dst, Size, AMemoryPerm.Write);
Buffer.MemoryCopy(
RamPtr + (uint)Src,
RamPtr + (uint)Dst,
Size,
Size);
}
private void EnsureRangeIsValid(long Position, long Size, AMemoryPerm Perm) private void EnsureRangeIsValid(long Position, long Size, AMemoryPerm Perm)
{ {
long EndPos = Position + Size; long EndPos = Position + Size;

23
Ryujinx.HLE/Gpu/Engines/NvGpuEngineDma.cs
View file

@ -58,6 +58,9 @@ namespace Ryujinx.HLE.Gpu.Engines
int SrcPitch = ReadRegister(NvGpuEngineDmaReg.SrcPitch); int SrcPitch = ReadRegister(NvGpuEngineDmaReg.SrcPitch);
int DstPitch = ReadRegister(NvGpuEngineDmaReg.DstPitch); int DstPitch = ReadRegister(NvGpuEngineDmaReg.DstPitch);
int XCount = ReadRegister(NvGpuEngineDmaReg.XCount);
int YCount = ReadRegister(NvGpuEngineDmaReg.YCount);
int DstBlkDim = ReadRegister(NvGpuEngineDmaReg.DstBlkDim); int DstBlkDim = ReadRegister(NvGpuEngineDmaReg.DstBlkDim);
int DstSizeX = ReadRegister(NvGpuEngineDmaReg.DstSizeX); int DstSizeX = ReadRegister(NvGpuEngineDmaReg.DstSizeX);
int DstSizeY = ReadRegister(NvGpuEngineDmaReg.DstSizeY); int DstSizeY = ReadRegister(NvGpuEngineDmaReg.DstSizeY);
@ -103,13 +106,23 @@ namespace Ryujinx.HLE.Gpu.Engines
DstSwizzle = new BlockLinearSwizzle(DstSizeX, 1, DstBlockHeight); DstSwizzle = new BlockLinearSwizzle(DstSizeX, 1, DstBlockHeight);
} }
for (int Y = 0; Y < DstSizeY; Y++) if (SrcLinear == DstLinear)
for (int X = 0; X < DstSizeX; X++)
{ {
long SrcOffset = SrcAddress + (uint)SrcSwizzle.GetSwizzleOffset(X, Y); long Src = Vmm.GetPhysicalAddress(SrcAddress);
long DstOffset = DstAddress + (uint)DstSwizzle.GetSwizzleOffset(X, Y); long Dst = Vmm.GetPhysicalAddress(DstAddress);
Vmm.WriteByte(DstOffset, Vmm.ReadByte(SrcOffset)); Vmm.Memory.CopyBytes(Src, Dst, XCount * YCount);
}
else
{
for (int Y = 0; Y < YCount; Y++)
for (int X = 0; X < XCount; X++)
{
long SrcOffset = SrcAddress + (uint)SrcSwizzle.GetSwizzleOffset(X, Y);
long DstOffset = DstAddress + (uint)DstSwizzle.GetSwizzleOffset(X, Y);
Vmm.WriteByte(DstOffset, Vmm.ReadByte(SrcOffset));
}
} }
} }

2
Ryujinx.HLE/Gpu/Engines/NvGpuEngineDmaReg.cs
View file

@ -6,6 +6,8 @@ namespace Ryujinx.HLE.Gpu.Engines
DstAddress = 0x102, DstAddress = 0x102,
SrcPitch = 0x104, SrcPitch = 0x104,
DstPitch = 0x105, DstPitch = 0x105,
XCount = 0x106,
YCount = 0x107,
DstBlkDim = 0x1c3, DstBlkDim = 0x1c3,
DstSizeX = 0x1c4, DstSizeX = 0x1c4,
DstSizeY = 0x1c5, DstSizeY = 0x1c5,