AOT Support (#303)

* AOT Support? * Renames * Register Windowing platforms with input platforms * Remove the need to disable first-party loading * Move WindowOptions defaults to static ctor * Cleanup * Style * Rollback Version changes * Multi-Target Silk.NET.Core to .Net Core 3.0 * Remove NET5_0 were unneeded * SdlInput.RegisterWindow -> SdlInput.RegisterPlatform * Refactor Window options to guarantee valid defaults * netcoreapp3.0 -> netcoreapp3.1 * Add extra restore to SilkTouch * Fix SilkTouch targetting issue * Fix Typo * Complete netcoreapp3.0 -> netcoreapp3.1 * ass -> asm * Fix SilkTouch NuGet * EnableSourceLink -> SilkEnableSourceLink
dotnet · Sep 25, 2020 · cde61b6 · cde61b6
1 parent 9d5bfc0
commit cde61b6
Show file tree

Hide file tree

Showing 51 changed files with 962 additions and 82 deletions.
diff --git a/build/props/common.props b/build/props/common.props
@@ -24,13 +24,13 @@
         </Description>
     </PropertyGroup>
     <!-- SourceLink -->
-    <PropertyGroup>
+    <PropertyGroup Condition="'$(SilkEnableSourceLink)' == ''">
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
-    <ItemGroup>
+    <ItemGroup Condition="'$(SilkEnableSourceLink)' == ''">
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     </ItemGroup>
 </Project>
diff --git a/examples/CSharp/Tutorial 1.1 - Hello Window/Tutorial 1.1 - Hello Window.csproj b/examples/CSharp/Tutorial 1.1 - Hello Window/Tutorial 1.1 - Hello Window.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
     </PropertyGroup>
 

diff --git a/examples/CSharp/Tutorial 1.2 - Hello quad/Tutorial 1.2 - Hello quad.csproj b/examples/CSharp/Tutorial 1.2 - Hello quad/Tutorial 1.2 - Hello quad.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 1.3 - Abstractions/Tutorial 1.3 - Abstraction.csproj b/examples/CSharp/Tutorial 1.3 - Abstractions/Tutorial 1.3 - Abstraction.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 1.4 - Textures/Tutorial 1.4 - Textures.csproj b/examples/CSharp/Tutorial 1.4 - Textures/Tutorial 1.4 - Textures.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 1.5 - Transformations/Tutorial 1.5 - Transformations.csproj b/examples/CSharp/Tutorial 1.5 - Transformations/Tutorial 1.5 - Transformations.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 2.1 - Co-ordinate Systems/Tutorial 2.1 - Co-ordinate Systems.csproj b/examples/CSharp/Tutorial 2.1 - Co-ordinate Systems/Tutorial 2.1 - Co-ordinate Systems.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 2.2 - Camera/Tutorial 2.2 - Camera.csproj b/examples/CSharp/Tutorial 2.2 - Camera/Tutorial 2.2 - Camera.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 3.1 - Ambient Lighting/Tutorial 3.1 - Ambient Lighting.csproj b/examples/CSharp/Tutorial 3.1 - Ambient Lighting/Tutorial 3.1 - Ambient Lighting.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 3.2 - Diffuse Lighting/Tutorial 3.2 - Diffuse Lighting.csproj b/examples/CSharp/Tutorial 3.2 - Diffuse Lighting/Tutorial 3.2 - Diffuse Lighting.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 3.3 - Specular Lighting/Tutorial 3.3 - Specular Lighting.csproj b/examples/CSharp/Tutorial 3.3 - Specular Lighting/Tutorial 3.3 - Specular Lighting.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 3.4 - Materials/Tutorial 3.4 - Materials.csproj b/examples/CSharp/Tutorial 3.4 - Materials/Tutorial 3.4 - Materials.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/examples/CSharp/Tutorial 3.5 - Lighting Maps/Tutorial 3.5 - Lighting Maps.csproj b/examples/CSharp/Tutorial 3.5 - Lighting Maps/Tutorial 3.5 - Lighting Maps.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Tutorial</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj b/src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Silk.NET.BuildTools</RootNamespace>
         <GenerateDocumentationFile>false</GenerateDocumentationFile>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/src/Core/Silk.NET.Core/Loader/LibraryLoader.cs b/src/Core/Silk.NET.Core/Loader/LibraryLoader.cs
@@ -3,7 +3,7 @@
 // You may modify and distribute Silk.NET under the terms
 // of the MIT license. See the LICENSE file for details.
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 using System.Reflection;
 using NativeLibrary3 = System.Runtime.InteropServices.NativeLibrary;
 #else
@@ -303,8 +303,8 @@ public void FreeNativeLibrary(IntPtr handle)
         /// <returns>A LibraryLoader suitable for loading libraries.</returns>
         public static LibraryLoader GetPlatformDefaultLoader()
         {
-#if NETCOREAPP3_0
-            return new NetCoreNativeLibraryLoader();
+#if NETCOREAPP3_1
+            return new NetNextNativeLibraryLoader();
 #else
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -333,12 +333,12 @@ private static void PlatformNotSupported()
             throw new PlatformNotSupportedException("This platform cannot load native libraries.");
         }
 
-#if NETCOREAPP3_0
-        private class NetCoreNativeLibraryLoader : LibraryLoader
+#if NETCOREAPP3_1
+        private class NetNextNativeLibraryLoader : LibraryLoader
         {
             protected override IntPtr CoreLoadNativeLibrary(string name)
             {
-                if (NativeLibrary3.TryLoad(name, Assembly.GetCallingAssembly(), null, out var lib))
+                if (NativeLibrary3.TryLoad(name, out var lib))
                 {
                     return lib;
                 }

diff --git a/src/Core/Silk.NET.Core/Silk.NET.Core.csproj b/src/Core/Silk.NET.Core/Silk.NET.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <LangVersion>preview</LangVersion>
     </PropertyGroup>

diff --git a/src/Core/Silk.NET.SilkTouch/Silk.NET.SilkTouch.csproj b/src/Core/Silk.NET.SilkTouch/Silk.NET.SilkTouch.csproj
@@ -2,11 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SilkEnableSourceLink>false</SilkEnableSourceLink>
   </PropertyGroup>
 
+    <PropertyGroup>
+        <RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json ;$(RestoreAdditionalProjectSources)</RestoreAdditionalProjectSources>
+    </PropertyGroup>
+
   <ItemGroup>
       <Compile Include="..\Silk.NET.Core\Native\NativeApiAttribute.cs" />
       <Compile Include="..\Silk.NET.Core\Native\UnmanagedType.cs" />
@@ -19,4 +23,6 @@
       <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
 
+  <Import Project="..\..\..\build\props\common.props" />
+
 </Project>
diff --git a/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs b/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs
@@ -15,12 +15,36 @@ namespace Silk.NET.Input
     /// </summary>
     public static class InputWindowExtensions
     {
+        private static List<IInputPlatform> _platforms = new List<IInputPlatform>();
+
         /// <summary>
         /// Gets the input platforms currently registered with the input system.
         /// </summary>
-        public static IReadOnlyList<IInputPlatform> Platforms { get; } = new List<IInputPlatform>();
+        public static IReadOnlyList<IInputPlatform> Platforms
+        {
+            get
+            {
+                if (!_initializedFirstPartyPlatforms)
+                {
+                    DoLoadFirstPartyPlatformsViaReflection();
+                    _initializedFirstPartyPlatforms = true;
+                }
+
+                return _platforms;
+            }
+        }
+
+        private static bool _initializedFirstPartyPlatforms = false;
 
-        static InputWindowExtensions()
+        public static void ShouldLoadFirstPartyPlatforms(bool shouldLoad)
+        {
+            if (_initializedFirstPartyPlatforms)
+                throw new InvalidOperationException("Input Platforms already loaded, cannot change first party loading");
+
+            _initializedFirstPartyPlatforms = !shouldLoad;
+        }
+
+        private static void DoLoadFirstPartyPlatformsViaReflection()
         {
             TryAdd("Silk.NET.Input.Glfw");
             TryAdd("Silk.NET.Input.Sdl");
@@ -52,13 +76,13 @@ public static IInputContext CreateInput(this IView view)
         /// Adds this input platform to the platform list. Shouldn't be used unless writing your own input backend.
         /// </summary>
         /// <param name="platform">The platform to add.</param>
-        public static void Add(IInputPlatform platform) => ((List<IInputPlatform>) Platforms).Add(platform);
+        public static void Add(IInputPlatform platform) => _platforms.Add(platform);
 
         /// <summary>
         /// Removes this input platform from the platform list. Shouldn't be used unless writing your own input backend.
         /// </summary>
         /// <param name="platform">The platform to remove.</param>
-        public static void Remove(IInputPlatform platform) => ((List<IInputPlatform>) Platforms).Remove(platform);
+        public static void Remove(IInputPlatform platform) => _platforms.Remove(platform);
 
         /// <summary>
         /// Attempts to load the given assembly by name, checks for a <see cref="IInputPlatform"/>, if one is found it

diff --git a/src/Input/Silk.NET.Input.Glfw/GlfwInput.cs b/src/Input/Silk.NET.Input.Glfw/GlfwInput.cs
@@ -0,0 +1,19 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using Silk.NET.Windowing;
+using Silk.NET.Windowing.Glfw;
+
+namespace Silk.NET.Input.Glfw
+{
+    public static class GlfwInput
+    {
+        public static void RegisterPlatform()
+        {
+            Window.Add(new GlfwPlatform());
+            InputWindowExtensions.Add(new GlfwInputPlatform());
+        }
+    }
+}
diff --git a/src/Input/Silk.NET.Input.Sdl/SdlInput.cs b/src/Input/Silk.NET.Input.Sdl/SdlInput.cs
@@ -0,0 +1,19 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using Silk.NET.Windowing;
+using Silk.NET.Windowing.Sdl;
+
+namespace Silk.NET.Input.Sdl
+{
+    public static class SdlInput
+    {
+        public static void RegisterPlatform()
+        {
+            Window.Add(new SdlPlatform());
+            InputWindowExtensions.Add(new SdlInputPlatform());
+        }
+    }
+}
diff --git a/src/Lab/BlankWindow/BlankWindow.csproj b/src/Lab/BlankWindow/BlankWindow.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 

diff --git a/src/Lab/CoreRTTest/BufferObject.cs b/src/Lab/CoreRTTest/BufferObject.cs
@@ -0,0 +1,36 @@
+using Silk.NET.OpenGL;
+using System;
+
+namespace Tutorial
+{
+    public class BufferObject<TDataType> : IDisposable
+        where TDataType : unmanaged
+    {
+        private uint _handle;
+        private BufferTargetARB _bufferType;
+        private GL _gl;
+
+        public unsafe BufferObject(GL gl, Span<TDataType> data, BufferTargetARB bufferType)
+        {
+            _gl = gl;
+            _bufferType = bufferType;
+
+            _handle = _gl.GenBuffer();
+            Bind();
+            fixed (void* d = data)
+            {
+                _gl.BufferData(bufferType, (UIntPtr)(data.Length * sizeof(TDataType)), d, BufferUsageARB.StaticDraw);
+            }
+        }
+
+        public void Bind()
+        {
+            _gl.BindBuffer(_bufferType, _handle);
+        }
+
+        public void Dispose()
+        {
+            _gl.DeleteBuffer(_handle);
+        }
+    }
+}