[2.0] New Interop

CODEOWNERS

@@ -1,5 +1,8 @@
 # Everything
-*                       @Perksey
+*                       			@Perksey
 
 # Maths
-/src/Maths/             @HurricanKai
+/src/Maths/             			@HurricanKai
+
+# SilkTouch
+/src/Core/Silk.NET.SilkTouch		@HurricanKai

Silk.NET.sln

@@ -260,8 +260,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Input.Extensions", "src\Input\Extensions\Silk.NET.Input.Extensions\Silk.NET.Input.Extensions.csproj", "{8DCB2EB4-D0DE-4EF9-ACB3-332055D594CB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing.Extensions.Veldrid", "src\Windowing\Extensions\Silk.NET.Windowing.Extensions.Veldrid\Silk.NET.Windowing.Extensions.Veldrid.csproj", "{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FramebufferResized", "src\Lab\FramebufferResized\FramebufferResized.csproj", "{7AF3C6CA-64FE-43F3-BD7B-C57C83AFAB79}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenXR", "OpenXR", "{ABD1AF6D-D9D1-4157-A1FF-AC98A054DA92}"
@@ -296,6 +294,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tutorial 3.5 - Lighting Map
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing", "src\Windowing\Silk.NET.Windowing\Silk.NET.Windowing.csproj", "{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch", "src\Core\Silk.NET.SilkTouch\Silk.NET.SilkTouch.csproj", "{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL", "src\Windowing\Silk.NET.SDL\Silk.NET.SDL.csproj", "{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}"
 EndProject
 Global
@@ -1631,18 +1631,6 @@ Global
 		{8DCB2EB4-D0DE-4EF9-ACB3-332055D594CB}.Release|x64.Build.0 = Release|Any CPU
 		{8DCB2EB4-D0DE-4EF9-ACB3-332055D594CB}.Release|x86.ActiveCfg = Release|Any CPU
 		{8DCB2EB4-D0DE-4EF9-ACB3-332055D594CB}.Release|x86.Build.0 = Release|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Debug|x64.Build.0 = Debug|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Debug|x86.Build.0 = Debug|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Release|x64.ActiveCfg = Release|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Release|x64.Build.0 = Release|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E}.Release|x86.Build.0 = Release|Any CPU
 		{7AF3C6CA-64FE-43F3-BD7B-C57C83AFAB79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AF3C6CA-64FE-43F3-BD7B-C57C83AFAB79}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AF3C6CA-64FE-43F3-BD7B-C57C83AFAB79}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1811,6 +1799,18 @@ Global
 		{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9}.Release|x64.Build.0 = Release|Any CPU
 		{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9}.Release|x86.ActiveCfg = Release|Any CPU
 		{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9}.Release|x86.Build.0 = Release|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Debug|x64.Build.0 = Debug|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Debug|x86.Build.0 = Debug|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Release|x64.ActiveCfg = Release|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Release|x64.Build.0 = Release|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Release|x86.ActiveCfg = Release|Any CPU
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C}.Release|x86.Build.0 = Release|Any CPU
 		{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1941,7 +1941,6 @@ Global
 		{77AA84B4-6D0A-4FCB-8268-18B2812D7955} = {E1F91563-7277-4E9B-A3B7-8D5FD9802A4A}
 		{8D84B804-168F-4EAA-BC09-F55A35A29887} = {FA9D1C95-5585-4DEC-B226-1447A486C376}
 		{8DCB2EB4-D0DE-4EF9-ACB3-332055D594CB} = {8D84B804-168F-4EAA-BC09-F55A35A29887}
-		{F5D5B4B4-58B7-48D9-881B-DD6A4001793E} = {3501BAD6-406A-49BC-BE0E-5A49A3AAAE6A}
 		{7AF3C6CA-64FE-43F3-BD7B-C57C83AFAB79} = {DFA0E841-33E5-4533-AF00-964E21A141B8}
 		{B6017708-8E8C-4230-95AD-2D06237D68D4} = {ABD1AF6D-D9D1-4157-A1FF-AC98A054DA92}
 		{90471225-AC23-424E-B62E-F6EC4C6ECAC0} = {ABD1AF6D-D9D1-4157-A1FF-AC98A054DA92}
@@ -1957,6 +1956,7 @@ Global
 		{5C119A02-AD0F-4222-9379-DB2DBAC59868} = {E1F91563-7277-4E9B-A3B7-8D5FD9802A4A}
 		{93CC7D39-530B-4E22-8D15-3A97FFA523F6} = {E1F91563-7277-4E9B-A3B7-8D5FD9802A4A}
 		{00D8F04F-2063-4F4E-B793-0F9DCF2BCFA9} = {23324041-2076-477C-A4BF-B385B8066C6C}
+		{6B703607-0D63-4A25-BB6A-EC1FBBD77A8C} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490}
 		{F16EDD0F-5ABE-4B25-98EE-8397E55B5CBA} = {23324041-2076-477C-A4BF-B385B8066C6C}
 	EndGlobalSection
 	EndGlobalSection

build/csharp_typemap.json

@@ -21,8 +21,8 @@
     "GLsizeiptrARB": "UIntPtr",
     "GLintptrARB": "IntPtr",
     "GLhandleARB": "uint",
-    "GLhalfARB": "Silk.NET.Core.Math.Half",
-    "GLhalfNV": "Silk.NET.Core.Math.Half",
+    "GLhalfARB": "System.Half",
+    "GLhalfNV": "System.Half",
     "GLcharARB": "char",
     "GLint64EXT": "long",
     "GLuint64EXT": "ulong",

build/props/bindings.props

@@ -1,6 +1,7 @@
 <Project>
     <ItemGroup>
         <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Core\Silk.NET.Core\Silk.NET.Core.csproj" />
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Core\Silk.NET.SilkTouch\Silk.NET.SilkTouch.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
     </ItemGroup>
 
     <Import Project="common.props" />

generator.json

@@ -29,14 +29,6 @@
             },
             "namespace": "Silk.NET.OpenGL",
             "extensionsNamespace": "Silk.NET.OpenGL.Extensions",
-            "legacyNameContainer": {
-                "Linux": "libGL.so.1",
-                "Windows": "opengl32.dll",
-                "MacOS": "/System/Library/Frameworks/OpenGL.framework/OpenGL",
-                "Android": "libGL.so.1",
-                "IOS": "/System/Library/Frameworks/OpenGL.framework/OpenGL",
-                "ClassName": "GLCoreLibraryNameContainer"
-            },
             "typeMaps": [
                 {
                     "$include.glTypeMap": "build/gl_typemap.json"
@@ -75,14 +67,6 @@
             },
             "namespace": "Silk.NET.OpenGL.Legacy",
             "extensionsNamespace": "Silk.NET.OpenGL.Legacy.Extensions",
-            "legacyNameContainer": {
-                "Linux": "libGL.so.1",
-                "Windows": "opengl32.dll",
-                "MacOS": "/System/Library/Frameworks/OpenGL.framework/OpenGL",
-                "Android": "libGL.so.1",
-                "IOS": "/System/Library/Frameworks/OpenGL.framework/OpenGL",
-                "ClassName": "OpenGLLibraryNameContainer"
-            },
             "typeMaps": [
                 {
                     "$include.glTypeMap": "build/gl_typemap.json"
@@ -121,14 +105,6 @@
             },
             "namespace": "Silk.NET.OpenGLES",
             "extensionsNamespace": "Silk.NET.OpenGLES.Extensions",
-            "legacyNameContainer": {
-                "Linux": "libGLESv2.so",
-                "Windows": "libGLESv2.dll",
-                "MacOS": "/System/Library/Frameworks/OpenGLES.framework/OpenGLES",
-                "Android": "libGLESv2.so",
-                "IOS": "/System/Library/Frameworks/OpenGLES.framework/OpenGLES",
-                "ClassName": "OpenGLESLibraryNameContainer"
-            },
             "typeMaps": [
                 {
                     "$include.glTypeMap": "build/gl_typemap.json"
@@ -167,13 +143,14 @@
             },
             "namespace": "Silk.NET.OpenCL",
             "extensionsNamespace": "Silk.NET.OpenCL.Extensions",
-            "legacyNameContainer": {
-                "Linux": "libOpenCL.so",
-                "Windows": "opencl.dll",
-                "MacOS": "/System/Library/Frameworks/OpenCL.framework/OpenCL",
-                "Android": "libOpenCL.so",
-                "IOS": "/System/Library/Frameworks/OpenCL.framework/OpenCL",
-                "ClassName": "OpenCLLibraryNameContainer"
+            "nameContainer": {
+                "linux-x64": "libOpenCL.so",
+                "win-x64": "opencl.dll",
+                "win-x86": "opencl.dll",
+                "osx-x64": "/System/Library/Frameworks/OpenCL.framework/OpenCL",
+                "android": "libOpenCL.so",
+                "iOS": "/System/Library/Frameworks/OpenCL.framework/OpenCL",
+                "className": "OpenCLLibraryNameContainer"
             },
             "typeMaps": [
                 {
@@ -324,13 +301,14 @@
             },
             "namespace": "Silk.NET.Vulkan",
             "extensionsNamespace": "Silk.NET.Vulkan.Extensions",
-            "legacyNameContainer": {
-                "Linux": "libvulkan.so.1",
-                "Windows": "vulkan-1.dll",
-                "MacOS": "libMoltenVK.dylib",
-                "Android": "libvulkan.so.1",
-                "IOS": "__Internal",
-                "ClassName": "VulkanLibraryNameContainer"
+            "nameContainer": {
+                "linux-x64": "libvulkan.so.1",
+                "win-x64": "vulkan-1.dll",
+                "win-x86": "vulkan-1.dll",
+                "osx-x64": "libMoltenVK.dylib",
+                "android": "libvulkan.so.1",
+                "iOS": "__Internal",
+                "className": "VulkanLibraryNameContainer"
             },
             "typeMaps": [
                 {
@@ -437,13 +415,14 @@
             },
             "namespace": "Silk.NET.Assimp",
             "extensionsNamespace": "Silk.NET.Assimp.Extensions",
-            "legacyNameContainer": {
-                "Linux": "libassimp.so.5",
-                "Windows": "Assimp32.dll",
-                "MacOS": "libassimp.5.dylib",
-                "Android": "libassimp.so.5",
-                "IOS": "__Internal",
-                "ClassName": "AssimpLibraryNameContainer"
+            "nameContainer": {
+                "linux-x64": "libassimp.so.5",
+                "win-x64": "Assimp64.dll",
+                "win-x86": "Assimp32.dll",
+                "osx-x64": "libassimp.5.dylib",
+                "android": "libassimp.so.5",
+                "iOS": "__Internal",
+                "className": "AssimpLibraryNameContainer"
             },
             "typeMaps": [
                 {
@@ -490,24 +469,25 @@
             },
             "namespace": "Silk.NET.OpenXR",
             "extensionsNamespace": "Silk.NET.OpenXR.Extensions",
-            "legacyNameContainer": {
-                "Linux": "libopenxr_loader.so.1",
-                "Windows": "openxr_loader.dll",
-                "MacOS": "null",
-                "Android": "libopenxr_loader.so.1",
-                "IOS": "__Internal",
-                "ClassName": "OpenXRLibraryNameContainer"
+            "nameContainer": {
+                "linux-x64": "libopenxr_loader.so.1",
+                "win-x64": "openxr_loader.dll",
+                "win-x86": "openxr_loader.dll",
+                "osx-x64": "null",
+                "android": "libopenxr_loader.so.1",
+                "iOS": "__Internal",
+                "className": "OpenXRLibraryNameContainer"
             },
             "typeMaps": [
                 {
                     "char": "byte",
                     "XR_DEFINE_ATOM": "uint64_t",
                     "LUID": "ulong",
                     "D3D_FEATURE_LEVEL": "uint",
-                    "VkInstance": "Silk.NET.GLFW.VkHandle",
-                    "VkPhysicalDevice": "Silk.NET.GLFW.VkHandle",
+                    "VkInstance": "Silk.NET.Core.Native.VkHandle",
+                    "VkPhysicalDevice": "Silk.NET.Core.Native.VkHandle",
                     "VkImage": "ulong",
-                    "VkDevice": "Silk.NET.GLFW.VkHandle",
+                    "VkDevice": "Silk.NET.Core.Native.VkHandle",
                     "PFN_xrVoidFunction": "FuncPtr",
                     "PFN_xrDebugUtilsMessengerCallbackEXT": "FuncPtr",
                     "PFNEGLGETPROCADDRESSPROC": "FuncPtr",
@@ -600,13 +580,14 @@
             },
             "namespace": "Silk.NET.SDL",
             "extensionsNamespace": "Silk.NET.SDL.Extensions",
-            "legacyNameContainer": {
-                "Linux": "libSDL2-2.0.so.0",
-                "Windows": "SDL2.dll",
-                "MacOS": "libSDL2-2.0.0.dylib",
-                "Android": "libSDL2-2.0.so.0",
-                "IOS": "__Internal",
-                "ClassName": "SDLLibraryNameContainer"
+            "nameContainer": {
+                "linux-x64": "libSDL2-2.0.so.0",
+                "win-x64": "SDL2.dll",
+                "win-x86": "SDL2.dll",
+                "osx-x64": "libSDL2-2.0.0.dylib",
+                "android": "libSDL2-2.0.so.0",
+                "iOS": "__Internal",
+                "className": "SDLLibraryNameContainer"
             },
             "typeMaps": [
                 {

src/Assimp/Silk.NET.Assimp/Assimp.cs

@@ -1,7 +1,7 @@
 using System;
+using Silk.NET.Core.Contexts;
 using Silk.NET.Core.Loader;
 using Silk.NET.Core.Native;
-using Ultz.SuperInvoke;
 
 #pragma warning disable 1591
 
@@ -11,7 +11,7 @@ public partial class Assimp
     {
         public static Assimp GetApi()
         {
-             return LibraryActivator.CreateInstance<Assimp>(new AssimpLibraryNameContainer().GetLibraryName());
+             return new Assimp(new DefaultNativeContext(new AssimpLibraryNameContainer().GetLibraryName()));
         }
 
         public override bool IsExtensionPresent(string extension) => IsExtensionSupported(extension) == 1;