front-load timestamp calculations and perform no sorting on inputs

Author: domportera

sources/Input/Input/Implementations/EnumInfo.cs

@@ -3,7 +3,6 @@
 
 
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 namespace Silk.NET.Input;

sources/Input/Input/Implementations/KeyHandling/TextRecorder.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Text;
 using Silk.NET.SDL;
 
@@ -256,6 +257,7 @@ public void InsertTextAt(Ptr<sbyte> textPtr, int cursorStart)
     /// <param name="textPtr"></param>
     /// <param name="cursorStart">The cursor position in the buffer to inject</param>
     /// <param name="textLength"></param>
+    [SkipLocalsInit]
     public void InsertTextAt(Ptr<sbyte> textPtr, int cursorStart, int textLength)
     {
         Span<char> textSpan = stackalloc char[textLength];

sources/Input/Input/Implementations/SDL3/DataStructures/GenericEvent.cs

@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.CompilerServices;
+
+namespace Silk.NET.Input.SDL3.DataStructures;
+
+internal readonly record struct GenericEvent(object Queue, int Index, SdlEventDiscriminator Type)
+{
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ref readonly T Value<T>() where T : struct => ref ((SdlInputEventQueue<T>)Queue).UnsafeGetRef(Index);
+}

sources/Input/Input/Implementations/SDL3/DataStructures/SdlInputEventQueue.cs

@@ -1,33 +1,31 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 namespace Silk.NET.Input.SDL3.DataStructures;
 
 internal sealed class SdlInputEventQueue<T> where T : struct
 {
-    public static readonly SdlEventDiscriminator TypeDiscriminator = InputEventKinds.Get(typeof(T));
+    private static readonly SdlEventDiscriminator _typeDiscriminator = InputEventKinds.Get(typeof(T));
 
-    public int Count => _events.Count;
+    /// <summary>
+    /// The "master" list of events we append each of our events to
+    /// </summary>
+    private readonly List<GenericEvent> _genericEvents;
+
+    public SdlInputEventQueue(List<GenericEvent> genericEventQueue) => _genericEvents = genericEventQueue;
 
-    public void Enqueue(in T item, ulong sdlTimestamp)
+    public void Enqueue(in T item)
     {
         if (_disposed)
         {
             GC.ReRegisterForFinalize(this);
             _disposed = false;
         }
 
+        _genericEvents.Add(new GenericEvent(this, _events.Count, _typeDiscriminator));
         _events.Add(item);
-        _sdlTimestamps.Add(sdlTimestamp);
-    }
-
-    public ReadOnlySpan<ulong> SdlTimestamps
-    {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        get => _sdlTimestamps.AsSpan();
     }
 
     /// <inheritdoc cref="PinnedGcMemory{T}.UnsafeGetRef"/>
@@ -43,7 +41,6 @@ public void Dispose()
         }
 
         _disposed = true;
-        _sdlTimestamps.Dispose();
         _events.Dispose();
         GC.SuppressFinalize(this);
     }
@@ -52,48 +49,16 @@ public void Dispose()
     {
         if (!_disposed)
         {
-            _sdlTimestamps.Dispose();
             _events.Dispose();
         }
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal SdlTimestampedValues<T> AsSpanPair() => new(_events.AsSpan(), _sdlTimestamps.AsSpan());
-
-
-    internal readonly ref struct SdlTimestampedValues<TValue> where TValue : struct
-    {
-        public readonly Span<TValue> Values;
-        public readonly Span<ulong> SdlTimestamps;
-
-        public SdlTimestampedValues(Span<TValue> values,
-            Span<ulong> sdlTimestamps)
-        {
-            Values = values;
-            SdlTimestamps = sdlTimestamps;
-        }
-
-        public int Length
-        {
-            get
-            {
-                Debug.Assert(Values.Length == SdlTimestamps.Length);
-                return Values.Length;
-            }
-        }
-    }
-
     private bool _disposed;
     private PinnedGcMemory<T> _events;
-    private PinnedGcMemory<ulong> _sdlTimestamps;
 
     /// <summary>
     /// Resets the count of our events without explicitly clearing the memory
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void ResetCount()
-    {
-        _events.ResetCount();
-        _sdlTimestamps.ResetCount();
-    }
+    public void ResetCount() => _events.ResetCount();
 }

sources/Input/Input/Implementations/SDL3/Devices/ISdlDevice.cs

@@ -9,7 +9,7 @@ namespace Silk.NET.Input.SDL3;
 /// <typeparam name="T"></typeparam>
 internal interface ISdlDevice<out T> : IInputDevice where T : SdlDevice
 {
-    public static abstract T? CreateDevice(ulong sdlDeviceId, long timestamp, ulong sdlTimestamp, bool isSimulated, SdlInputBackend backend, SdlInputEventContext context);
+    public static abstract T? CreateDevice(ulong sdlDeviceId, long timestamp, bool isSimulated, SdlInputBackend backend, SdlInputEventContext context);
 }
 
 internal interface INeedCompletionEachFrame

sources/Input/Input/Implementations/SDL3/Devices/Joysticks/ISdlJoystick.cs

@@ -20,25 +20,22 @@ internal interface ISdlJoystick : IOrderedDevice
     /// </summary>
     /// <param name="axis">Input axis (which axis)</param>
     /// <param name="joystickInput">Input axis value</param>
-    /// <param name="sdlTimestamp"></param>
     /// <param name="timestamp"></param>
-    public void UpdateFromJoyAxis(int axis, short joystickInput, ulong sdlTimestamp, long timestamp);
+    public void UpdateFromJoyAxis(int axis, short joystickInput, long timestamp);
 
     /// <summary>
     /// Raw joystick hat input events are forwarded here
     /// </summary>
     /// <param name="hatIdx">Input hat (which hat)</param>
     /// <param name="hatState">Input hat value</param>
-    /// <param name="sdlTimestamp"></param>
     /// <param name="timestamp"></param>
-    public void UpdateFromJoyHat(int hatIdx, SdlJoystick.HatState hatState, ulong sdlTimestamp, long timestamp);
+    public void UpdateFromJoyHat(int hatIdx, SdlJoystick.HatState hatState, long timestamp);
 
     /// <summary>
     /// Raw joystick button input events are forwarded here
     /// </summary>
     /// <param name="buttonIdx">Input button (which button)</param>
     /// <param name="down">Button state</param>
-    /// <param name="sdlTimestamp"></param>
     /// <param name="timestamp"></param>
-    public void UpdateFromJoyButton(int buttonIdx, bool down, ulong sdlTimestamp, long timestamp);
+    public void UpdateFromJoyButton(int buttonIdx, bool down, long timestamp);
 }