Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
7bfb5f79b8 | ||
|
8cc2479825 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -74,6 +74,9 @@ _TeamCity*
|
|||||||
# DotCover is a Code Coverage Tool
|
# DotCover is a Code Coverage Tool
|
||||||
*.dotCover
|
*.dotCover
|
||||||
|
|
||||||
|
# Rider is a Visual Studio alternative
|
||||||
|
.idea/*
|
||||||
|
|
||||||
# NCrunch
|
# NCrunch
|
||||||
*.ncrunch*
|
*.ncrunch*
|
||||||
.*crunch*.local.xml
|
.*crunch*.local.xml
|
||||||
|
@@ -85,9 +85,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
|
|||||||
}
|
}
|
||||||
|
|
||||||
int alignWidth = Constants.StrideAlignment / bpp;
|
int alignWidth = Constants.StrideAlignment / bpp;
|
||||||
return tex.RegionX == 0 &&
|
return stride / bpp == BitUtils.AlignUp(xCount, alignWidth);
|
||||||
tex.RegionY == 0 &&
|
|
||||||
stride / bpp == BitUtils.AlignUp(xCount, alignWidth);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -161,6 +159,20 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
|
|||||||
var dst = Unsafe.As<uint, DmaTexture>(ref _state.State.SetDstBlockSize);
|
var dst = Unsafe.As<uint, DmaTexture>(ref _state.State.SetDstBlockSize);
|
||||||
var src = Unsafe.As<uint, DmaTexture>(ref _state.State.SetSrcBlockSize);
|
var src = Unsafe.As<uint, DmaTexture>(ref _state.State.SetSrcBlockSize);
|
||||||
|
|
||||||
|
int srcRegionX = 0, srcRegionY = 0, dstRegionX = 0, dstRegionY = 0;
|
||||||
|
|
||||||
|
if (!srcLinear)
|
||||||
|
{
|
||||||
|
srcRegionX = src.RegionX;
|
||||||
|
srcRegionY = src.RegionY;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dstLinear)
|
||||||
|
{
|
||||||
|
dstRegionX = dst.RegionX;
|
||||||
|
dstRegionY = dst.RegionY;
|
||||||
|
}
|
||||||
|
|
||||||
int srcStride = (int)_state.State.PitchIn;
|
int srcStride = (int)_state.State.PitchIn;
|
||||||
int dstStride = (int)_state.State.PitchOut;
|
int dstStride = (int)_state.State.PitchOut;
|
||||||
|
|
||||||
@@ -182,8 +194,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
|
|||||||
dst.MemoryLayout.UnpackGobBlocksInZ(),
|
dst.MemoryLayout.UnpackGobBlocksInZ(),
|
||||||
dstBpp);
|
dstBpp);
|
||||||
|
|
||||||
(int srcBaseOffset, int srcSize) = srcCalculator.GetRectangleRange(src.RegionX, src.RegionY, xCount, yCount);
|
(int srcBaseOffset, int srcSize) = srcCalculator.GetRectangleRange(srcRegionX, srcRegionY, xCount, yCount);
|
||||||
(int dstBaseOffset, int dstSize) = dstCalculator.GetRectangleRange(dst.RegionX, dst.RegionY, xCount, yCount);
|
(int dstBaseOffset, int dstSize) = dstCalculator.GetRectangleRange(dstRegionX, dstRegionY, xCount, yCount);
|
||||||
|
|
||||||
if (srcLinear && srcStride < 0)
|
if (srcLinear && srcStride < 0)
|
||||||
{
|
{
|
||||||
@@ -272,13 +284,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
|
|||||||
|
|
||||||
for (int y = 0; y < yCount; y++)
|
for (int y = 0; y < yCount; y++)
|
||||||
{
|
{
|
||||||
srcCalculator.SetY(src.RegionY + y);
|
srcCalculator.SetY(srcRegionY + y);
|
||||||
dstCalculator.SetY(dst.RegionY + y);
|
dstCalculator.SetY(dstRegionY + y);
|
||||||
|
|
||||||
for (int x = 0; x < xCount; x++)
|
for (int x = 0; x < xCount; x++)
|
||||||
{
|
{
|
||||||
int srcOffset = srcCalculator.GetOffset(src.RegionX + x);
|
int srcOffset = srcCalculator.GetOffset(srcRegionX + x);
|
||||||
int dstOffset = dstCalculator.GetOffset(dst.RegionX + x);
|
int dstOffset = dstCalculator.GetOffset(dstRegionX + x);
|
||||||
|
|
||||||
*(T*)(dstBase + dstOffset) = *(T*)(srcBase + srcOffset);
|
*(T*)(dstBase + dstOffset) = *(T*)(srcBase + srcOffset);
|
||||||
}
|
}
|
||||||
|
@@ -391,24 +391,29 @@ namespace Ryujinx.Input.HLE
|
|||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private static JoystickPosition ApplyDeadzone(float x, float y, float deadzone)
|
private static JoystickPosition ApplyDeadzone(float x, float y, float deadzone)
|
||||||
{
|
{
|
||||||
return new JoystickPosition
|
float magnitudeClamped = Math.Min(MathF.Sqrt(x * x + y * y), 1f);
|
||||||
|
|
||||||
|
if (magnitudeClamped <= deadzone)
|
||||||
{
|
{
|
||||||
Dx = ClampAxis(MathF.Abs(x) > deadzone ? x : 0.0f),
|
return new JoystickPosition() {Dx = 0, Dy = 0};
|
||||||
Dy = ClampAxis(MathF.Abs(y) > deadzone ? y : 0.0f)
|
}
|
||||||
|
|
||||||
|
return new JoystickPosition()
|
||||||
|
{
|
||||||
|
Dx = ClampAxis((x / magnitudeClamped) * ((magnitudeClamped - deadzone) / (1 - deadzone))),
|
||||||
|
Dy = ClampAxis((y / magnitudeClamped) * ((magnitudeClamped - deadzone) / (1 - deadzone)))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private static short ClampAxis(float value)
|
private static short ClampAxis(float value)
|
||||||
{
|
{
|
||||||
if (value <= -short.MaxValue)
|
if (Math.Sign(value) < 0)
|
||||||
{
|
{
|
||||||
return -short.MaxValue;
|
return (short)Math.Max(value * -short.MinValue, short.MinValue);
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return (short)(value * short.MaxValue);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return (short)Math.Min(value * short.MaxValue, short.MaxValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
Reference in New Issue
Block a user