opentk · NogginBops · Apr 2, 2024 · Apr 2, 2024 · Apr 11, 2024 · Apr 13, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -30,3 +30,9 @@
 *.zip binary
 *.pdf binary
 *.ttf binary
+*.glb binary
+*.blend binary
+*.blend1 binary
+*.ani binary
+*.gif binary
+*.res binary
diff --git a/.gitignore b/.gitignore
@@ -490,7 +490,12 @@ fabric.properties
 .LSOverride
 
 # Icon must end with two \r
-Icon
+# Icon\r\r is a folder that macos creates, but keeping two \r\r characters in .gitignore
+# seems to be hard, so we instead wildcard on Icon? and then use a negative pattern to bring
+# back most other uses of Icon.
+# - Noggin_bops 2024-06-14
+Icon?
+![iI]con[_a-zA-Z0-9]
 
 # Thumbnails
 ._*

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,12 +1,20 @@
 {
     "version": "0.2.0",
     "configurations": [
+
         {
             "name": "C#: OpenTK.Platform.Tests",
             "type": "dotnet",
             "request": "launch",
             "projectPath": "${workspaceFolder}/tests/OpenTK.Platform.Tests/OpenTK.Platform.Tests.csproj",
             "launchConfigurationId": "TargetFramework=;OpenTK.Platform.Tests"
+        },
+        {
+            "name": "C#: Bejeweled",
+            "type": "dotnet",
+            "request": "launch",
+            "projectPath": "${workspaceFolder}/tests/Bejeweled/Bejeweled.csproj",
+            "launchConfigurationId": "TargetFramework=;Bejeweled"
         }
     ]
 }
diff --git a/OpenTK.sln b/OpenTK.sln
@@ -99,6 +99,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ANGLETestProject", "tests\A
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "build", "build\build.fsproj", "{49DFA6FD-D4F9-4EAD-BC24-3D585B1E8B94}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bejeweled", "tests\Bejeweled\Bejeweled.csproj", "{C7D52AD4-4D53-4D37-87B5-0864CF94EA45}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -213,6 +215,10 @@ Global
 		{49DFA6FD-D4F9-4EAD-BC24-3D585B1E8B94}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49DFA6FD-D4F9-4EAD-BC24-3D585B1E8B94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49DFA6FD-D4F9-4EAD-BC24-3D585B1E8B94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7D52AD4-4D53-4D37-87B5-0864CF94EA45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7D52AD4-4D53-4D37-87B5-0864CF94EA45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7D52AD4-4D53-4D37-87B5-0864CF94EA45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7D52AD4-4D53-4D37-87B5-0864CF94EA45}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -238,6 +244,7 @@ Global
 		{0892F9BC-D689-47BC-80A3-2AF88DCD84BF} = {0B9B71A1-29F7-4CC5-9A9D-9DF122BE8B28}
 		{7888FB56-FCBC-4240-B78F-691481A56AA1} = {0B9B71A1-29F7-4CC5-9A9D-9DF122BE8B28}
 		{49DFA6FD-D4F9-4EAD-BC24-3D585B1E8B94} = {471E0D18-D620-4CBE-A471-F3DB470E6D49}
+		{C7D52AD4-4D53-4D37-87B5-0864CF94EA45} = {0B9B71A1-29F7-4CC5-9A9D-9DF122BE8B28}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {82DDE6D6-0D55-49B4-9C64-B31B4A6E729F}

diff --git a/build/build.fsproj b/build/build.fsproj
@@ -26,13 +26,13 @@
     <!-- so we must later copy the nuget.exe out from this package into our own. -->
     <!-- This was not needed when we ran our build using an .fsx file using paket to download dependencies as -->
     <!-- paket downloaded these dependencies into a project local folder. -->
-    <PackageReference Include="NuGet.CommandLine" Version="6.9.1" GeneratePathProperty="true">
+    <PackageReference Include="NuGet.CommandLine" Version="6.10.0" GeneratePathProperty="true">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
     <!-- See https://github.com/fsprojects/FAKE/issues/2748 -->
-    <PackageReference Include="MSBuild.StructuredLogger" Version="2.1.858" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.243" />
     <!-- See https://github.com/fsprojects/FAKE/issues/2722 -->
     <!-- 17.3.2 is the last .net6.0 version of the package -->
     <PackageReference Include="Microsoft.Build" Version="17.3.2" />

diff --git a/props/stylecop.props b/props/stylecop.props
@@ -14,7 +14,7 @@
     </AdditionalFiles>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
   </ItemGroup>
   <Import Project="common.props" Condition="!$(HasCommonProperties)"/>
 </Project>
diff --git a/src/OpenAL/OpenTK.Audio.OpenAL/Native/ALBase.cs b/src/OpenAL/OpenTK.Audio.OpenAL/Native/ALBase.cs
@@ -42,6 +42,9 @@ public static void RegisterOpenALResolver()
             IntPtr ptr = AL.GetProcAddress(name);
             if (ptr == IntPtr.Zero)
             {
+                // FIXME: We want to have a strategy for AOT and trimming here.
+                // What do we do in contexts where we can't generate functions at runtime...?
+
                 // If we can't load the function for whatever reason we dynamically generate a delegate to
                 // give the user an error message that is actually understandable.
                 MethodInfo invoke = typeof(TDelegate).GetMethod("Invoke");

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/Creative.EFX/Interfaces/IEFX.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/Creative.EFX/Interfaces/IEFX.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Extensions.Creative.EFX
 {
     /// <summary>

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/Creative.EFX/Interfaces/IEFXEffectSlots.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/Creative.EFX/Interfaces/IEFXEffectSlots.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 // ReSharper disable ExplicitCallerInfoArgument
 namespace OpenTK.OpenAL.Extensions.Creative.EFX
 {

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/Creative.EFX/Interfaces/IEFXFilters.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/Creative.EFX/Interfaces/IEFXFilters.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 // ReSharper disable ExplicitCallerInfoArgument
 namespace OpenTK.OpenAL.Extensions.Creative.EFX
 {

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/Creative.EFX/Interfaces/IEFXListeners.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/Creative.EFX/Interfaces/IEFXListeners.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 // ReSharper disable ExplicitCallerInfoArgument
 namespace OpenTK.OpenAL.Extensions.Creative.EFX
 {

diff --git a/.../OpenTK.OpenAL.Extensions/Creative.MultiChannelBuffers/Interfaces/IMultiChannelBuffers.cs b/.../OpenTK.OpenAL.Extensions/Creative.MultiChannelBuffers/Interfaces/IMultiChannelBuffers.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Extensions.Creative.MultiChannelBuffers
 {
     /// <summary>

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.ALAWFormat/Interfaces/IALAWFormat.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.ALAWFormat/Interfaces/IALAWFormat.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Extensions.EXT.ALAWFormat
 {
     /// <summary>

diff --git a/...K.OpenAL.Extensions/EXT.Capture.Enumeration/Interfaces/ICaptureEnumerationContextState.cs b/...K.OpenAL.Extensions/EXT.Capture.Enumeration/Interfaces/ICaptureEnumerationContextState.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 // ReSharper disable ExplicitCallerInfoArgument
 namespace OpenTK.OpenAL.Extensions.EXT.Capture.Enumeration
 {

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.Capture/Interfaces/ICaptureContext.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.Capture/Interfaces/ICaptureContext.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Extensions.EXT.Capture
 {
     /// <summary>

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.Capture/Interfaces/ICaptureContextState.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.Capture/Interfaces/ICaptureContextState.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Extensions.EXT.Capture
 {
     /// <summary>

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.IMA4Format/Interfaces/IIMA4Format.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.IMA4Format/Interfaces/IIMA4Format.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Native.Extensions.EXT.IMA4Format
 {
     /// <summary>

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.MP3Format/Interfaces/IMP3Format.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.MP3Format/Interfaces/IMP3Format.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Extensions.EXT.MP3Format
 {
     /// <summary>

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.MULAWFormat/Interfaces/IMULAWFormat.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.MULAWFormat/Interfaces/IMULAWFormat.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Extensions.EXT.MULAWFormat
 {
     /// <summary>

diff --git a/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.VorbisFormat/Interfaces/IVorbisFormat.cs b/src/OpenAL/OpenTK.OpenAL.Extensions/EXT.VorbisFormat/Interfaces/IVorbisFormat.cs
@@ -7,7 +7,6 @@
 // of the MIT license. See the LICENSE file for details.
 //
 
-
 namespace OpenTK.OpenAL.Extensions.EXT.VorbisFormat
 {
     /// <summary>

diff --git a/src/OpenTK.Compute/OpenCL/CLGL.cs b/src/OpenTK.Compute/OpenCL/CLGL.cs
@@ -16,22 +16,22 @@ public enum ObjectType : uint
             ObjectRenderBuffer = 0x2003,
 
             /// <summary>
-            /// Introduced in OpenCL 1.2
+            /// Introduced in OpenCL 1.2.
             /// </summary>
             ObjectTexture2DArray = 0x200E,
 
             /// <summary>
-            /// Introduced in OpenCL 1.2
+            /// Introduced in OpenCL 1.2.
             /// </summary>
             ObjectTexture1D = 0x200F,
 
             /// <summary>
-            /// Introduced in OpenCL 1.2
+            /// Introduced in OpenCL 1.2.
             /// </summary>
             ObjectTexture1DArray = 0x2010,
 
             /// <summary>
-            /// Introduced in OpenCL 1.2
+            /// Introduced in OpenCL 1.2.
             /// </summary>
             ObjectTextureBuffer = 0x2011,
         }
@@ -42,7 +42,7 @@ public enum TextureInfo : uint
             MipmapLevel = 0x2005,
 
             /// <summary>
-            /// Introduced in OpenCL 1.2
+            /// Introduced in OpenCL 1.2.
             /// </summary>
             NumSamples = 0x2012,
         }

diff --git a/src/OpenTK.Core/OpenTK.Core.csproj b/src/OpenTK.Core/OpenTK.Core.csproj
@@ -6,6 +6,7 @@
     <Description>Core shared functionality for the OpenTK library.</Description>
     <OutputType>Library</OutputType>
     <PackageIcon>icon.png</PackageIcon>
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,6 +19,5 @@
 
   <ItemGroup>
     <ProjectReference Include="..\OpenTK.Mathematics\OpenTK.Mathematics.csproj" />
-    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
   </ItemGroup>
 </Project>
diff --git a/src/OpenTK.Core/Platform/Bitmap.cs b/src/OpenTK.Core/Platform/Bitmap.cs
@@ -11,6 +11,8 @@ namespace OpenTK.Core.Platform
     /// </summary>
     public class Bitmap
     {
+        // FIXME: Add stuff like colorspace info?
+
         /// <summary>
         /// The width of the bitmap in pixels.
         /// </summary>