misc: Replace references to IntPtr/UIntPtr with nint/nuint + code cleanups.

This commit is contained in:
Evan Husted 2024-10-26 08:46:41 -05:00
parent a09d314817
commit dfb4854d19
172 changed files with 902 additions and 914 deletions

View file

@ -71,11 +71,11 @@ namespace Ryujinx.Input.SDL2
public GamepadFeaturesFlag Features { get; }
private IntPtr _gamepadHandle;
private nint _gamepadHandle;
private float _triggerThreshold;
public SDL2Gamepad(IntPtr gamepadHandle, string driverId)
public SDL2Gamepad(nint gamepadHandle, string driverId)
{
_gamepadHandle = gamepadHandle;
_buttonsUserMapping = new List<ButtonMappingEntry>(20);
@ -127,11 +127,11 @@ namespace Ryujinx.Input.SDL2
protected virtual void Dispose(bool disposing)
{
if (disposing && _gamepadHandle != IntPtr.Zero)
if (disposing && _gamepadHandle != nint.Zero)
{
SDL_GameControllerClose(_gamepadHandle);
_gamepadHandle = IntPtr.Zero;
_gamepadHandle = nint.Zero;
}
}
@ -187,7 +187,7 @@ namespace Ryujinx.Input.SDL2
{
float* values = stackalloc float[ElementCount];
int result = SDL_GameControllerGetSensorData(_gamepadHandle, sensorType, (IntPtr)values, ElementCount);
int result = SDL_GameControllerGetSensorData(_gamepadHandle, sensorType, (nint)values, ElementCount);
if (result != 0)
return Vector3.Zero;

View file

@ -160,9 +160,9 @@ namespace Ryujinx.Input.SDL2
return null;
}
IntPtr gamepadHandle = SDL_GameControllerOpen(joystickIndex);
nint gamepadHandle = SDL_GameControllerOpen(joystickIndex);
if (gamepadHandle == IntPtr.Zero)
if (gamepadHandle == nint.Zero)
{
return null;
}

View file

@ -225,7 +225,7 @@ namespace Ryujinx.Input.SDL2
unsafe
{
IntPtr statePtr = SDL_GetKeyboardState(out int numKeys);
nint statePtr = SDL_GetKeyboardState(out int numKeys);
rawKeyboardState = new ReadOnlySpan<byte>((byte*)statePtr, numKeys);
}