Windowing & input (HLU) robustness improvements (#462)

Author: Perksey

src/Input/Silk.NET.Input.Sdl/SdlInputContext.cs

@@ -270,7 +270,8 @@ private void Update(double obj)
                 gp.Update();
             }
 
-            Sdl.ThrowError();
+            // There's actually nowhere here that will raise an SDL error that we cause.
+            // Sdl.ThrowError();
         }
 
         private void RefreshJoysticksAndGamepads()

src/Windowing/Silk.NET.SDL/SdlContext.cs

@@ -99,9 +99,11 @@ private void AssertNotCreated()
         /// <inheritdoc cref="IGLContext" />
         public void Dispose()
         {
-            AssertCreated();
-            _sdl.GLDeleteContext(_ctx);
-            _ctx = null;
+            if (_ctx != null)
+            {
+                _sdl.GLDeleteContext(_ctx);
+                _ctx = null;
+            }
         }
 
         /// <inheritdoc cref="IGLContext" />

src/Windowing/Silk.NET.Windowing.Common/Internals/ViewImplementationBase.cs

@@ -54,6 +54,7 @@ protected ViewImplementationBase(ViewOptions opts)
         // Property bases - these have extra functionality baked into their getters and setters
         protected abstract Vector2D<int> CoreSize { get; }
         protected abstract nint CoreHandle { get; }
+        protected abstract bool CoreIsClosing { get; }
 
         // Function bases - again extra functionality on top
         protected abstract void CoreInitialize(ViewOptions opts);
@@ -62,13 +63,11 @@ protected ViewImplementationBase(ViewOptions opts)
         // Other APIs implemented abstractly
         public abstract IGLContext? GLContext { get; }
         public abstract IVkSurface? VkSurface { get; }
-        public abstract bool IsClosing { get; }
         public abstract VideoMode VideoMode { get; }
         public abstract bool IsEventDriven { get; set; }
         public abstract Vector2D<int> FramebufferSize { get; }
         public abstract void DoEvents();
         public abstract void ContinueEvents();
-        public abstract void Dispose();
         public abstract Vector2D<int> PointToClient(Vector2D<int> point);
         public abstract Vector2D<int> PointToScreen(Vector2D<int> point);
         public abstract void Close();
@@ -113,14 +112,14 @@ public void Reset()
             {
                 return;
             }
-            
+
+            IsInitialized = false;
             _renderStopwatch.Reset();
             _updateStopwatch.Reset();
             _lifetimeStopwatch.Reset();
             CoreReset();
             UnregisterCallbacks();
             Native = null;
-            IsInitialized = false;
         }
 
         // Game loop controls
@@ -197,6 +196,7 @@ public void DoUpdate()
         public INativeWindow? Native { get; private set; }
         public Vector2D<int> Size => IsInitialized ? CoreSize : default;
         public nint Handle => IsInitialized ? CoreHandle : 0;
+        public bool IsClosing => !IsInitialized || CoreIsClosing; // IsClosing = true if window is reset halts game loop
         public GraphicsAPI API => _optionsCache.API;
         public double Time => _lifetimeStopwatch.Elapsed.TotalSeconds;
         public int? PreferredDepthBufferBits => _optionsCache.PreferredDepthBufferBits;
@@ -254,6 +254,12 @@ public Vector2D<int> PointToFramebuffer(Vector2D<int> point)
                 Y = point.Y * (fSize.Y / aSize.Y)
             };
         }
+        
+        public virtual void Dispose()
+        {
+            Reset();
+            GC.SuppressFinalize(this);
+        }
 
         // Invoke system
         public object Invoke(Delegate d, params object[] args)

src/Windowing/Silk.NET.Windowing.Common/Internals/WindowImplementationBase.cs

@@ -97,7 +97,7 @@ Vector2D<int> IWindowProperties.Size
 
         bool IWindow.IsClosing
         {
-            get => IsClosing;
+            get => CoreIsClosing;
             set => IsClosingSettable = value;
         }
 

src/Windowing/Silk.NET.Windowing.Glfw/GlfwWindow.cs

@@ -14,13 +14,10 @@
 
 namespace Silk.NET.Windowing.Glfw
 {
-    internal unsafe class GlfwWindow : WindowImplementationBase, IGLContext, IVkSurface
+    internal unsafe class GlfwWindow : WindowImplementationBase, IVkSurface
     {
         internal readonly GLFW.Glfw _glfw;
         internal WindowHandle* _glfwWindow;
-        private string _localTitleCache; // glfw doesn't let us get the window title.
-        private readonly GlfwWindow? _parent;
-        private readonly GlfwMonitor? _initialMonitor;
 
         // Callbacks
         private GlfwCallbacks.WindowPosCallback? _onMove;
@@ -31,8 +28,14 @@ internal unsafe class GlfwWindow : WindowImplementationBase, IGLContext, IVkSurf
         private GlfwCallbacks.WindowFocusCallback? _onFocusChanged;
         private GlfwCallbacks.WindowIconifyCallback? _onMinimized;
         private GlfwCallbacks.WindowMaximizeCallback? _onMaximized;
+        
+        // Other variables
+        private readonly GlfwWindow? _parent;
+        private readonly GlfwMonitor? _initialMonitor;
         private Vector2D<int> _nonFullscreenPosition;
         private Vector2D<int> _nonFullscreenSize;
+        private string _localTitleCache; // glfw doesn't let us get the window title.
+        private GlfwContext? _glContext;
 
         public GlfwWindow(WindowOptions optionsCache, GlfwWindow? parent, GlfwMonitor? monitor) : base(optionsCache)
         {
@@ -48,11 +51,11 @@ protected override Vector2D<int> CoreSize
             get
             {
                 _glfw.GetWindowSize(_glfwWindow, out var width, out var height);
-                return new Vector2D<int>(width, height);
+                return new(width, height);
             }
         }
 
-        protected override unsafe Rectangle<int> CoreBorderSize
+        protected override Rectangle<int> CoreBorderSize
         {
             get
             {
@@ -84,7 +87,9 @@ protected override void CoreReset()
         }
 
         public override IGLContext? GLContext
-            => API.API == ContextAPI.OpenGL || API.API == ContextAPI.OpenGLES ? this : null;
+            => API.API == ContextAPI.OpenGL || API.API == ContextAPI.OpenGLES
+                ? _glContext ??= new(_glfw, _glfwWindow, this)
+                : null;
 
         public override IVkSurface? VkSurface => API.API == ContextAPI.Vulkan && _glfw.VulkanSupported() ? this : null;
 
@@ -109,7 +114,7 @@ protected override Vector2D<int> CorePosition
             get
             {
                 _glfw.GetWindowPos(_glfwWindow, out var x, out var y);
-                return new Vector2D<int>(x, y);
+                return new(x, y);
             }
             set => _glfw.SetWindowPos(_glfwWindow, value.X, value.Y);
         }
@@ -326,7 +331,6 @@ protected override void CoreInitialize(WindowOptions opts)
                 {
                     null => null,
                     _ when share is GlfwContext glfwContext => (WindowHandle*) glfwContext.Handle,
-                    _ when share is GlfwWindow glfwWindow => glfwWindow._glfwWindow,
                     _ => throw new ArgumentException("The given shared context should be a GlfwContext or GlfwWindow")
                 }
             );
@@ -373,7 +377,7 @@ public override void SetWindowIcon(ReadOnlySpan<RawImage> icons)
                     var icon = icons[i];
                     // ReSharper disable once StackAllocInsideLoop
                     Span<byte> iconMemory = stackalloc byte[icon.Pixels.Length];
-                    images[i] = new Image
+                    images[i] = new()
                     {
                         Width = icon.Width, Height = icon.Height,
                         Pixels = (byte*) Unsafe.AsPointer(ref iconMemory[0])
@@ -390,7 +394,6 @@ public override void SetWindowIcon(ReadOnlySpan<RawImage> icons)
         public override IWindow CreateWindow(WindowOptions opts) => new GlfwWindow(opts, this, null);
 
         public override IWindowHost? Parent => (IWindowHost?) _parent ?? Monitor;
-        public IGLContextSource? Source => (IGLContextSource?) GLContext;
         public override IGLContext? SharedContext { get; }
 
 
@@ -486,7 +489,7 @@ private static int IndexOf<T>(T** array, T* target, int count)
             return -1;
         }
 
-        public override bool IsClosing => _glfw.WindowShouldClose(_glfwWindow);
+        protected override bool CoreIsClosing => _glfw.WindowShouldClose(_glfwWindow);
 
         public override VideoMode VideoMode
             => IsInitialized ? CachedVideoMode = Monitor?.VideoMode ?? CachedVideoMode : CachedVideoMode;
@@ -498,7 +501,7 @@ public override Vector2D<int> FramebufferSize
             get
             {
                 _glfw.GetFramebufferSize(_glfwWindow, out var width, out var height);
-                return new Vector2D<int>(width, height);
+                return new(width, height);
             }
         }
 
@@ -516,12 +519,6 @@ public override void DoEvents()
 
         public override void ContinueEvents() => _glfw.PostEmptyEvent();
 
-        public override void Dispose()
-        {
-            Reset();
-            GC.SuppressFinalize(this);
-        }
-
         public nint GetProcAddress(string proc, int? slot = default)
         {
             var ret = _glfw.GetProcAddress(proc);
@@ -567,7 +564,7 @@ protected override void RegisterCallbacks()
 
             _onFramebufferResize = (window, width, height) =>
             {
-                FramebufferResize?.Invoke(new Vector2D<int>(width, height));
+                FramebufferResize?.Invoke(new(width, height));
             };
 
             _onClosing = window => Closing?.Invoke();
@@ -690,12 +687,6 @@ protected override void UnregisterCallbacks()
             Reset();
         }
 
-        public bool IsCurrent => _glfw.GetCurrentContext() == _glfwWindow;
-        public void SwapInterval(int interval) => _glfw.SwapInterval(interval);
-        public void SwapBuffers() => _glfw.SwapBuffers(_glfwWindow);
-        public void MakeCurrent() => _glfw.MakeContextCurrent(_glfwWindow);
-        public void Clear() => _glfw.MakeContextCurrent(null);
-
         public VkNonDispatchableHandle Create<T>(VkHandle instance, T* allocator) where T : unmanaged
         {
             var surface = stackalloc VkNonDispatchableHandle[1];

src/Windowing/Silk.NET.Windowing.Sdl/SdlView.cs

@@ -62,7 +62,7 @@ public SdlView(void* nativeHandle, IGLContext? ctx, SdlPlatform platform) : base
         internal SDL.Sdl Sdl { get; }
         internal SDL.Window* SdlWindow { get; private set; }
         internal bool IsClosingVal { get; set; }
-        public override bool IsClosing => IsClosingVal;
+        protected override bool CoreIsClosing => IsClosingVal;
         public override bool IsEventDriven { get; set; }
         public List<Event> Events { get; } = new List<Event>();
         protected SdlView? ParentView { get; }
@@ -274,12 +274,6 @@ private void ClearEvents()
             }
         }
 
-        public override void Dispose()
-        {
-            Reset();
-            GC.SuppressFinalize(this);
-        }
-
         ~SdlView()
         {
             Reset();