Resolving issues seen by Kai

Implementing test for Version32, moving Version32 to Core, removing implementations from Interfaces among other stuff I probably forgot.

Author: Redhacker1

Silk.NET.sln

@@ -82,6 +82,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch.Integrat
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch.TestFramework", "tests\Silk.NET.SilkTouch.TestFramework\Silk.NET.SilkTouch.TestFramework.csproj", "{381D1039-3259-488F-BB25-D90EE63A3E82}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.Tests", "tests\Silk.NET.Core.Tests\Silk.NET.Core.Tests.csproj", "{6076C9E6-D094-49C5-B526-0AF355D11AC7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -332,6 +334,18 @@ Global
 		{381D1039-3259-488F-BB25-D90EE63A3E82}.Release|x64.Build.0 = Release|Any CPU
 		{381D1039-3259-488F-BB25-D90EE63A3E82}.Release|x86.ActiveCfg = Release|Any CPU
 		{381D1039-3259-488F-BB25-D90EE63A3E82}.Release|x86.Build.0 = Release|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Debug|x64.Build.0 = Debug|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Debug|x86.Build.0 = Debug|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Release|x64.ActiveCfg = Release|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Release|x64.Build.0 = Release|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Release|x86.ActiveCfg = Release|Any CPU
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -364,6 +378,7 @@ Global
 		{66FE736C-C407-44C3-A94E-4345E22AA95E} = {94D5D1E1-B998-4CB1-9D04-DA138A2B0F3C}
 		{381D1039-3259-488F-BB25-D90EE63A3E82} = {94D5D1E1-B998-4CB1-9D04-DA138A2B0F3C}
 		{7A2A3176-DBA1-4026-AF65-8E36B4F09B02} = {C9718C94-2F21-4E8D-B55D-8F0B1A131346}
+		{6076C9E6-D094-49C5-B526-0AF355D11AC7} = {94D5D1E1-B998-4CB1-9D04-DA138A2B0F3C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}

src/libraries/Silk.Net.Windowing/Abstract/Version32.cs renamed to src/libraries/Silk.NET.Core/Version32.cs

@@ -1,7 +1,6 @@
-
-using System;
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+using System;
 namespace Silk.NET.Core
 {
     /// <summary>
@@ -13,18 +12,45 @@ public readonly struct Version32
         /// The underlying Vulkan-compatible 32-bit version integer.
         /// </summary>
         public uint Value { get; }
+
         /// <summary>
         /// Creates a Vulkan version structure from the given major, minor, and patch values.
         /// </summary>
-        /// <param name="major">The major value.</param>
-        /// <param name="minor">The minor value.</param>
-        /// <param name="patch">The patch value.</param>
-        public Version32(uint major, uint minor, uint patch) => Value = major << 22 | minor << 12 | patch;
+        /// <param name="variant">The major value. It is a 3-bit integer</param>
+        /// <param name="major">The major value. It is a 7-bit integer</param>
+        /// <param name="minor">The minor value. It is a 10-bit integer</param>
+        /// <param name="patch">The patch value. It is a 12-bit integer</param>
+        /// <exception cref="ArgumentOutOfRangeException">major, minor, or patch were out of the range of valid values</exception>
+        public Version32(uint variant, uint major, uint minor, uint patch)
+        {
+            /*The variant is a 3-bit integer packed into bits 31-29. -Donovan/Redhacker1, Why is this not used? 
+            
+            The major version is a 7-bit integer packed into bits 28-22. 2^7 = 128
+            
+            The minor version number is a 10-bit integer packed into bits 21-12. 2^10 = 1024
+            
+            The patch version number is a 12-bit integer packed into bits 11-0. 2^12 = 4096
+            */
+            // Sanity check to ensure that the values are correct
+            if ( (variant & uint.MaxValue - 7) != 0 || (major & uint.MaxValue - 127) != 0 || (minor & uint.MaxValue - 1023) != 0 || (patch & uint.MaxValue - 4095) != 0)
+            {
+                throw new ArgumentOutOfRangeException("variant, major, minor and/or patch were out of range, ");
+            }
+
+
+            Value = (variant & 7) << 29 | (major & 127) << 22 | (minor & 1023) << 12 | (patch & 4095);
+        }
+
         /// <summary>
         /// Creates a Vulkan version structure from the given Vulkan-compatible value.
         /// </summary>
         /// <param name="value">The value.</param>
         private Version32(uint value) => Value = value;
+        
+        /// <summary>
+        /// Gets the variant component of this version structure.
+        /// </summary>
+        public uint Variant => Value >> 29;
         /// <summary>
         /// Gets the major component of this version structure.
         /// </summary>
@@ -50,7 +76,7 @@ public readonly struct Version32
         /// <param name="version">The version instance.</param>
         /// <returns>The 32-bit version structure.</returns>
         public static implicit operator Version32
-            (Version version) => new Version32((uint) version.Major, (uint) version.Minor, (uint) version.Build);
+            (Version version) => new Version32(0, (uint) version.Major, (uint) version.Minor, (uint) version.Build);
 
         /// <summary>
         /// Gets the 32-bit unsigned integer representation for this 32-bit version structure.
@@ -67,4 +93,4 @@ public static implicit operator Version32
         public static implicit operator Version
             (Version32 version) => new Version((int) version.Major, (int) version.Minor, (int) version.Patch);
     }
-}
+}

src/libraries/Silk.Net.Windowing/Abstract/ContextFlags.cs

@@ -1,4 +1,8 @@
-namespace Silk.NET.Windowing
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using System;
+
+namespace Silk.NET.Windowing
 {
     /// <summary>
     /// Represents flags related to the OpenGL context.
@@ -23,4 +27,4 @@ public enum ContextFlags
         /// <remarks>On OpenGL contexts older than 3.0, this flag does nothing.</remarks>
         ForwardCompatible = 2
     }
-}
+}

src/libraries/Silk.Net.Windowing/Abstract/ContextProfile.cs

@@ -1,4 +1,6 @@
-namespace Silk.NET.Windowing
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+namespace Silk.NET.Windowing
 {
     /// <summary>
     /// Represents the context profile OpenGL should use.
@@ -16,4 +18,4 @@ public enum ContextProfile
         /// </summary>
         Compatability
     }
-}
+}

src/libraries/Silk.Net.Windowing/Abstract/Delegates.cs

@@ -1,8 +1,27 @@
-using Silk.NET.Maths;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using Silk.NET.Maths;
 using Silk.NET.Windowing;
 
+//TODO: Copy proposal explanation as to why we are doing this, also other than Vector2DAction these names are HIGHLY specialized for no apparently good reason, I am not a fan.
+/// <summary>
+/// An action that takes a <see cref="Vector2D{T}"/>
+/// </summary>
 public delegate void Vector2DAction(Vector2D<int> newValue);
+
+/// <summary>
+/// An action that takes a double as a parameter
+/// </summary>
 public delegate void DeltaAction(double deltaTime);
+/// <summary>
+///  An action that takes a <see cref="WindowState"/>
+/// </summary>
 public delegate void WindowStateAction(WindowState newState);
+/// <summary>
+/// An action that takes a list of strings as a parameter, intended for file path callbacks
+/// </summary>
 public delegate void FilePathsAction(string[] filePaths);
-public delegate void ToggleAction(bool newValue);
+/// <summary>
+/// An action that takes a bool as a parameter, intended for a callback when things are toggled.
+/// </summary>
+public delegate void ToggleAction(bool newValue);

src/libraries/Silk.Net.Windowing/Abstract/IDesktopSurface.cs

@@ -1,4 +1,8 @@
-using Silk.NET.Core;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using System;
+using System.Collections.Generic;
+using Silk.NET.Core;
 using Silk.NET.Maths;
 
 namespace Silk.NET.Windowing
@@ -54,7 +58,7 @@ public interface IDesktopSurface : ISurface
         IEnumerable<IScreen>? AvailableScreens { get; }
 
         /// <summary>
-        /// Gets or sets whether the window waits for an event to be posted before existing <see cref="DoEvents" />.
+        /// Gets or sets whether the window waits for an event to be posted before existing <see cref="IDesktopSurface.DoEvents" />.
         /// </summary>
         bool IsEventDriven { get; set; }
 
@@ -75,7 +79,7 @@ public interface IDesktopSurface : ISurface
         /// <remarks>
         /// Because these are distances and not coordinates, they are always zero or positive.
         /// </remarks>
-        /// <seealso cref="WindowExtensions.GetFullSize"/>
+        /// <seealso cref="IDesktopSurface.Size"/>
         Rectangle<int> BorderSize { get; }
 
         /// <summary>
@@ -107,44 +111,28 @@ public interface IDesktopSurface : ISurface
         /// Sets the window icons.
         /// </summary>
         /// <param name="icons">Either a collection of window icons, or null to set to the default icon.</param>
-        void SetWindowIcon(ReadOnlySpan<RawImage> icons)
-        {
-            throw new NotImplementedException();
-        }
+        void SetWindowIcon(ReadOnlySpan<RawImage> icons);
 
         /// <summary>
-        /// When using <see cref="WindowOptions.IsEventDriven"/> = true, wakes the main thread from
+        /// When using <see cref="IDesktopSurface.IsEventDriven"/> = true, wakes the main thread from
         /// its blocking wait on incoming events.  Can be called from any thread.
         /// </summary>
-        void ContinueEvents()
-        {
-            throw new NotImplementedException();
-        }
+        void ContinueEvents();
 
         /// <summary>
         /// Converts this point to client coordinates.
         /// </summary>
         /// <param name="point">The point to transform.</param>
         /// <returns>The transformed point.</returns>
         /// <remarks>Expects screen coordinates as input.</remarks>
-        Vector2D<int> PointToClient(Vector2D<int> point)
-        {
-            return new Vector2D<int>(point.X - Position.X, point.Y - Position.Y);
-        }
+        Vector2D<int> PointToClient(Vector2D<int> point);
 
         /// <summary>
         /// Converts this point to screen coordinates.
         /// </summary>
         /// <param name="point">The point to transform.</param>
         /// <returns>The transformed point.</returns>
         /// <remarks>Expects client coordinates as input.</remarks>
-        Vector2D<int> PointToScreen(Vector2D<int> point)
-        {
-            return new Vector2D<int>(point.X + Position.X, point.Y + Position.Y);
-        }
-        public Vector2D<int> PointToFramebuffer(Vector2D<int> point)
-        {
-            throw new NotImplementedException();
-        }
+        Vector2D<int> PointToScreen(Vector2D<int> point);
     }
-}
+}

src/libraries/Silk.Net.Windowing/Abstract/IGLDesktopSurface.cs

@@ -1,5 +1,9 @@
-
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 namespace Silk.NET.Windowing
 {
+    /// <summary>
+    /// An interface that defines a desktop surface with the ability to create a desktop GL Context
+    /// </summary>
     public interface IGLDesktopSurface : IDesktopSurface, IGLSurface { }
-}
+}

src/libraries/Silk.Net.Windowing/Abstract/IGLSurface.cs

@@ -1,17 +1,28 @@
-namespace Silk.NET.Windowing
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+namespace Silk.NET.Windowing
 {
+    /// <summary>
+    /// A surface that can have a desktop GL context.
+    /// </summary>
     public interface IGLSurface : INativeGLSurface
     {
+        /// <summary>
+        /// The flags the context was created with
+        /// </summary>
         ContextFlags ContextFlags { get; set; }
+        /// <summary>
+        /// The profile of the specified context.
+        /// </summary>
         ContextProfile ContextProfile { get; set; }
-        IGLSurface? SharedContext { get; set; }
+        /// <summary>
+        /// The surface representing the context to use.
+        /// </summary>
+        IGLSurface? SharedContext { get; set; } // Redhacker1/Donovan: DAFUQ? What exactly is supposed to be going on here
 
         /// <summary>
         /// Enables OpenGL support for this surface. This will create a surface upon initialization.
         /// </summary>
-        bool TryEnableOpenGL()
-        {
-            throw new NotImplementedException();
-        }
+        bool TryEnableOpenGL();
     }
-}
+}

src/libraries/Silk.Net.Windowing/Abstract/IGLTransparentFramebufferSurface.cs

@@ -1,8 +1,16 @@
-
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 namespace Silk.NET.Windowing
 {
+    /// <summary>
+    /// Represents a GL Surface with a transparent Framebuffer
+    /// </summary>
+    // Is GLFW making this an optional feature worth adding this? -Donovan/Redhacker1
     public interface IGLTransparentFramebuffer : INativeGLSurface
     {
+        /// <summary>
+        /// Whether the buffer can be actually transparent
+        /// </summary>
         bool TransparentFramebuffer { get; set; }
     }
-}
+}

src/libraries/Silk.Net.Windowing/Abstract/IGlesDesktopSurface.cs

@@ -1,7 +1,12 @@
-namespace Silk.NET.Windowing
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+namespace Silk.NET.Windowing
 {
+    /// <summary>
+    /// A Desktop Surface with the ability to create a GLES surface
+    /// </summary>
     public interface IGlesDesktopSurface : IDesktopSurface, IGlesSurface
     {
 
     }
-}
+}