manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-14 22:40:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
riperiperi 2022-02-12 20:49:45 +00:00
parent 66476b7fd5
commit 9c1e9a4034
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Ryujinx.Graphics.Gpu/Engine/Twod/TwodClass.cs
View file

@ -81,12 +81,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
/// <summary> /// <summary>
/// Determine if the given region covers the full texture, also considering width alignment. /// Determine if the given region covers the full texture, also considering width alignment.
/// </summary> /// </summary>
/// <param name="texture"></param> /// <param name="texture">The texture to check</param>
/// <param name="formatInfo"></param> /// <param name="formatInfo"></param>
/// <param name="x1"></param> /// <param name="x1">Region start x</param>
/// <param name="y1"></param> /// <param name="y1">Region start y</param>
/// <param name="x2"></param> /// <param name="x2">Region end x</param>
/// <param name="y2"></param> /// <param name="y2">Region end y</param>
/// <returns>True if the region covers the full texture, false otherwise</returns> /// <returns>True if the region covers the full texture, false otherwise</returns>
private bool IsCopyRegionComplete(TwodTexture texture, FormatInfo formatInfo, int x1, int y1, int x2, int y2) private bool IsCopyRegionComplete(TwodTexture texture, FormatInfo formatInfo, int x1, int y1, int x2, int y2)
{ {
@ -154,6 +154,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
// If the copy is not equal to the width and height of the texture, we will need to copy partially. // If the copy is not equal to the width and height of the texture, we will need to copy partially.
// It's worth noting that it has already been established that the src and dst are the same size. // It's worth noting that it has already been established that the src and dst are the same size.
if (w == width && h == height) if (w == width && h == height)
{ {
memoryManager.Write(dstGpuVa, srcSpan); memoryManager.Write(dstGpuVa, srcSpan);
@ -201,16 +202,18 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
{ {
int x = 0; int x = 0;
srcCalculator.SetY(y);
for (; x < strideTrunc; x += 16) for (; x < strideTrunc; x += 16)
{ {
int offset = srcCalculator.GetOffset(x, y) >> 4; int offset = srcCalculator.GetOffset(x) >> 4;
dstVec[offset] = srcVec[offset]; dstVec[offset] = srcVec[offset];
} }
for (; x < stride; x++) for (; x < stride; x++)
{ {
int offset = srcCalculator.GetOffset(x, y); int offset = srcCalculator.GetOffset(x);
dstSpan[offset] = srcSpan[offset]; dstSpan[offset] = srcSpan[offset];
} }
@ -297,7 +300,6 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
IsCopyRegionComplete(srcCopyTexture, srcCopyTextureFormat, srcX1, srcY1, srcX2, srcY2) && IsCopyRegionComplete(srcCopyTexture, srcCopyTextureFormat, srcX1, srcY1, srcX2, srcY2) &&
IsCopyRegionComplete(dstCopyTexture, dstCopyTextureFormat, dstX1, dstY1, dstX2, dstY2); IsCopyRegionComplete(dstCopyTexture, dstCopyTextureFormat, dstX1, dstY1, dstX2, dstY2);
var srcTexture = memoryManager.Physical.TextureCache.FindOrCreateTexture( var srcTexture = memoryManager.Physical.TextureCache.FindOrCreateTexture(
memoryManager, memoryManager,
srcCopyTexture, srcCopyTexture,
@ -312,14 +314,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
if (canDirectCopy) if (canDirectCopy)
{ {
// Directly copy the data on CPU. // Directly copy the data on CPU.
//Common.Logging.Logger.Warning?.Print(Common.Logging.LogClass.Gpu, $"Fast Copy {srcX2} {srcY2} {srcCopyTexture.Format}");
UnscaledFullCopy(srcCopyTexture, dstCopyTexture, srcX2, srcY2, srcCopyTextureFormat.BytesPerPixel); UnscaledFullCopy(srcCopyTexture, dstCopyTexture, srcX2, srcY2, srcCopyTextureFormat.BytesPerPixel);
} }
return; return;
} }
//Common.Logging.Logger.Error?.Print(Common.Logging.LogClass.Gpu, $"Slow Copy {srcX2} {srcY2} {srcCopyTexture.Format}");
memoryManager.Physical.TextureCache.Lift(srcTexture); memoryManager.Physical.TextureCache.Lift(srcTexture);
// When the source texture that was found has a depth format, // When the source texture that was found has a depth format,