drashna/ryujinx
1
0
Fork 0
Code Activity Actions

hid: Rewrite shared memory management (#2257)

Browse source 
* hid: Rewrite shared memory management

This entirely rewrite our ancient (and original) HID shared memory
interface to be more usable and accurate.

HID update logics were updated to reflect those changes but should work
still the same way it previously did.

This need heavy testing just in case to avoid possible regressions.

* Silence warnings

* Address gdkchan's comments

* Address Ac_K's comments

* Address one missing nit
This commit is contained in:
Mary 2021-05-02 22:01:30 +02:00 • committed by GitHub
parent 0e9823d7e6
commit 3443023a08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 1395 additions and 624 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Ryujinx.HLE/HOS/Services/Hid/HidDevices/TouchDevice.cs
View file

@ -1,3 +1,5 @@
using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common;
using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.TouchScreen;
using System;
namespace Ryujinx.HLE.HOS.Services.Hid
@ -8,39 +10,38 @@ namespace Ryujinx.HLE.HOS.Services.Hid
public void Update(params TouchPoint[] points)
{
ref ShMemTouchScreen touchscreen = ref _device.Hid.SharedMemory.TouchScreen;
ref RingLifo<TouchScreenState> lifo = ref _device.Hid.SharedMemory.TouchScreen;
int currentIndex = UpdateEntriesHeader(ref touchscreen.Header, out int previousIndex);
ref TouchScreenState previousEntry = ref lifo.GetCurrentEntryRef();
if (!Active)
TouchScreenState newState = new TouchScreenState
{
return;
}
SamplingNumber = previousEntry.SamplingNumber + 1
};
ref TouchScreenState currentEntry = ref touchscreen.Entries[currentIndex];
TouchScreenState previousEntry = touchscreen.Entries[previousIndex];
currentEntry.SampleTimestamp = previousEntry.SampleTimestamp + 1;
currentEntry.SampleTimestamp2 = previousEntry.SampleTimestamp2 + 1;
currentEntry.NumTouches = (ulong)points.Length;
int pointsLength = Math.Min(points.Length, currentEntry.Touches.Length);
for (int i = 0; i < pointsLength; ++i)
if (Active)
{
TouchPoint pi = points[i];
currentEntry.Touches[i] = new TouchScreenStateData
newState.TouchesCount = points.Length;
int pointsLength = Math.Min(points.Length, newState.Touches.Length);
for (int i = 0; i < pointsLength; ++i)
{
SampleTimestamp = currentEntry.SampleTimestamp,
X = pi.X,
Y = pi.Y,
TouchIndex = (uint)i,
DiameterX = pi.DiameterX,
DiameterY = pi.DiameterY,
Angle = pi.Angle
};
TouchPoint pi = points[i];
newState.Touches[i] = new TouchState
{
DeltaTime = newState.SamplingNumber,
X = pi.X,
Y = pi.Y,
FingerId = (uint)i,
DiameterX = pi.DiameterX,
DiameterY = pi.DiameterY,
RotationAngle = pi.Angle
};
}
}
lifo.Write(ref newState);
}
}
}