dotnet · Perksey · Aug 3, 2019 · Aug 2, 2019 · Aug 2, 2019 · Aug 2, 2019
diff --git a/build/binder_bakery_info/GL-All.json b/build/binder_bakery_info/GL-All.json
@@ -35,7 +35,8 @@
       "ClassName": "GLCoreLibraryNameContainer"
     },
     "FunctionPrefix": "gl",
-    "ClassName": "GL"
+    "ClassName": "GL",
+    "SymbolLoader": "Silk.NET.Windowing.SilkLoader.OpenGL"
   },
   {
     "Name": "OpenGL (Compatibility Profile)",
@@ -73,7 +74,8 @@
       "ClassName": "OpenGLLibraryNameContainer"
     },
     "FunctionPrefix": "gl",
-    "ClassName": "GL"
+    "ClassName": "GL",
+    "SymbolLoader": "Silk.NET.Windowing.SilkLoader.OpenGL"
   },
   {
     "Name": "GLES",
@@ -96,6 +98,7 @@
       "ClassName": "OpenGLESLibraryNameContainer"
     },
     "FunctionPrefix": "gl",
-    "ClassName": "GL"
+    "ClassName": "GL",
+    "SymbolLoader": "Silk.NET.Windowing.SilkLoader.OpenGLES"
   }
 ]
diff --git a/build/binder_specifications/GLES.json b/build/binder_specifications/GLES.json
@@ -81977,6 +81977,7 @@
   "ClassName": "GL",
   "Version": null,
   "FunctionPrefix": "gl",
+  "SymbolLoaderName": "Silk.NET.Windowing.SilkLoader.OpenGLES",
   "Names": {
     "Linux": "libGLESv2.so",
     "Windows": "libGLESv2.dll",

diff --git a/build/binder_specifications/OpenGL (Compatibility Profile).json b/build/binder_specifications/OpenGL (Compatibility Profile).json
@@ -288881,6 +288881,7 @@
   "ClassName": "GL",
   "Version": null,
   "FunctionPrefix": "gl",
+  "SymbolLoaderName": "Silk.NET.Windowing.SilkLoader.OpenGL",
   "Names": {
     "Linux": "libGL.so.1",
     "Windows": "opengl32.dll",

diff --git a/build/binder_specifications/OpenGL.json b/build/binder_specifications/OpenGL.json
@@ -155897,6 +155897,7 @@
   "ClassName": "GL",
   "Version": null,
   "FunctionPrefix": "gl",
+  "SymbolLoaderName": "Silk.NET.Windowing.SilkLoader.OpenGL",
  "Names": {
     "Linux": "libGL.so.1",
     "Windows": "opengl32.dll",

diff --git a/examples/Triangle/Game.cs b/examples/Triangle/Game.cs
@@ -3,6 +3,7 @@
 // You may modify and distribute Silk.NET under the terms
 // of the MIT license. See the LICENSE file for details.
 
+using System;
 using System.Drawing;
 using Silk.NET.OpenGL;
 using Silk.NET.Windowing;
@@ -48,11 +49,14 @@ public void OnLoad()
         {
             gl.ClearColor(1.0f, 0.4f, 0.3f, 1.0f);
 
-            vbo = gl.GenBuffer(1);
-            gl.BindBuffer((int)GLEnum.ArrayBuffer, vbo);
+            vbo = gl.GenBuffer();
+            gl.BindBuffer(GLEnum.ArrayBuffer, vbo);
 
-            //var size = (uint)vertices.Length * sizeof(float);
-            //gl.BufferData((int)GLEnum.ArrayBuffer, new UIntPtr(size), vertices, (int)GLEnum.StaticDraw);
+            var size = (uint)vertices.Length * sizeof(float);
+            fixed (float* floats = vertices)
+            {
+                gl.BufferData(GLEnum.ArrayBuffer, new UIntPtr(size), floats, GLEnum.StaticDraw);
+            }
         }
 
         public void OnRender(double delta)

diff --git a/src/Core/BuildTools/Bind/ProfileWriter.cs b/src/Core/BuildTools/Bind/ProfileWriter.cs
@@ -270,6 +270,14 @@ public static void WriteMixedModeClasses(this Project project, Profile profile,
                 sw.WriteLine("            : base(path, opts)");
                 sw.WriteLine("        {");
                 sw.WriteLine("        }");
+                if (profile.SymbolLoaderName != null)
+                {
+                    sw.WriteLine();
+                    sw.WriteLine($"        static {profile.ClassName}()");
+                    sw.WriteLine("        {");
+                    sw.WriteLine($"            LibraryLoader.CreateBuilder<{profile.ClassName}>({profile.SymbolLoaderName});");
+                    sw.WriteLine("        }");
+                }
                 sw.WriteLine("    }");
                 sw.WriteLine("}");
                 sw.WriteLine();

diff --git a/src/Core/BuildTools/Common/Profile.cs b/src/Core/BuildTools/Common/Profile.cs
@@ -55,6 +55,11 @@ public class Profile
         /// </summary>
         public string FunctionPrefix { get; set; }
 
+        /// <summary>
+        /// Gets or sets the name of the symbol loader.
+        /// </summary>
+        public string SymbolLoaderName { get; set; }
+
         /// <summary>
         /// Gets or sets the name container for this profile.
         /// </summary>

diff --git a/src/Core/BuildTools/Convert/Baking/ProfileBakery.cs b/src/Core/BuildTools/Convert/Baking/ProfileBakery.cs
@@ -44,7 +44,8 @@ public static void Bake(ProfileBakeryInformation information, string folder, boo
                 Namespace = information.Namespace,
                 ExtensionsNamespace = information.ExtensionsNamespace,
                 OutputFolder = information.OutputFolder,
-                ClassName = information.ClassName
+                ClassName = information.ClassName,
+                SymbolLoaderName = information.SymbolLoader
             };
             profile.Projects.Add
             (

diff --git a/src/Core/BuildTools/Convert/Baking/ProfileBakeryInformation.cs b/src/Core/BuildTools/Convert/Baking/ProfileBakeryInformation.cs
@@ -52,6 +52,11 @@ public class ProfileBakeryInformation
         /// Gets or sets the class name for this profile.
         /// </summary>
         public string ClassName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the symbol loader for this profile.
+        /// </summary>
+        public string SymbolLoader { get; set; }
         // ReSharper disable InconsistentNaming
 
         /// <summary>
@@ -64,6 +69,7 @@ public class ProfileBakeryInformation
             .WithName("GLES")
             .WithOutputFolder("OpenGL")
             .WithClassName("GL")
+            .WithSymbolLoader("Silk.NET.Windowing.SilkLoader.OpenGLES")
             .WithLibraries
             (
                 "OpenGLESLibraryNameContainer",
@@ -89,6 +95,7 @@ public class ProfileBakeryInformation
             .WithName("OpenGL (Compatibility Profile)")
             .WithOutputFolder("OpenGL")
             .WithClassName("GL")
+            .WithSymbolLoader("Silk.NET.Windowing.SilkLoader.OpenGL")
             .WithLibraries
             (
                 "OpenGLLibraryNameContainer",
@@ -114,6 +121,7 @@ public class ProfileBakeryInformation
             .WithNamespaces("Silk.NET.OpenGL", "Silk.NET.OpenGL.Extensions")
             .WithName("OpenGL")
             .WithOutputFolder("OpenGL")
+            .WithSymbolLoader("Silk.NET.Windowing.SilkLoader.OpenGL")
             .WithClassName("GL")
             .WithLibraries
             (

diff --git a/src/Core/BuildTools/Convert/Baking/ProfileBakeryInformationBuilder.cs b/src/Core/BuildTools/Convert/Baking/ProfileBakeryInformationBuilder.cs
@@ -119,5 +119,11 @@ public ProfileBakeryInformationBuilder WithClassName(string className)
             Result.ClassName = className;
             return this;
         }
+
+        public ProfileBakeryInformationBuilder WithSymbolLoader(string loader)
+        {
+            Result.SymbolLoader = loader;
+            return this;
+        }
     }
 }
diff --git a/src/Core/Silk.NET.Core/Loader/LibraryLoader.cs b/src/Core/Silk.NET.Core/Loader/LibraryLoader.cs
@@ -3,8 +3,11 @@
 // You may modify and distribute Silk.NET under the terms
 // of the MIT license. See the LICENSE file for details.
 
+using System;
+using System.Collections.Generic;
 using System.Reflection;
 using AdvancedDLSupport;
+using AdvancedDLSupport.Loaders;
 using Silk.NET.Core.Attributes;
 using Silk.NET.Core.Native;
 
@@ -16,26 +19,33 @@ public static class LibraryLoader
                                                       ImplementationOptions.UseLazyBinding |
                                                       ImplementationOptions.SuppressSecurity |
                                                       ImplementationOptions.EnableOptimizations;
-
-        private static readonly NativeLibraryBuilder _builder;
-
-        static LibraryLoader()
-        {
-            _builder = new NativeLibraryBuilder(Options);
-        }
+
+        private static Dictionary<Type, NativeLibraryBuilder> _builders = new Dictionary<Type, NativeLibraryBuilder>();
 
         public static T1 Load<T1>(SearchPathContainer nameContainer) where T1 : NativeAPI
         {
-            return _builder.ActivateClass<T1>(nameContainer.GetLibraryName());
+            CreateBuilder<T1>();
+            return _builders[typeof(T1)].ActivateClass<T1>(nameContainer.GetLibraryName());
         }
 
         public static T1 Load<T1, T2>(T2 baseApi) where T1 : NativeExtension<T2> where T2 : NativeAPI
         {
+            CreateBuilder<T2>();
             return baseApi.IsExtensionPresent(GetExtensionAttribute(typeof(T1)).Name)
-                ? _builder.ActivateClass<T1>(baseApi.SearchPaths.GetLibraryName())
+                ? _builders[typeof(T2)].ActivateClass<T1>(baseApi.SearchPaths.GetLibraryName())
                 : null;
         }
 
+        public static void CreateBuilder<T1>(IPlatformLoader loader = null) where T1:NativeAPI
+        {
+            if (!_builders.ContainsKey(typeof(T1)) || loader != null)
+            {
+                _builders[typeof(T1)] = new NativeLibraryBuilder(Options)
+                    .WithLibraryLoader(x => loader ?? x)
+                    .WithSymbolLoader(x => loader ?? x);
+            }
+        }
+
         private static ExtensionAttribute GetExtensionAttribute(MemberInfo type)
         {
             return type.GetCustomAttribute<ExtensionAttribute>();

diff --git a/src/Core/Silk.NET.Core/Native/NativeAPI.cs b/src/Core/Silk.NET.Core/Native/NativeAPI.cs
@@ -4,6 +4,7 @@
 // of the MIT license. See the LICENSE file for details.
 
 using AdvancedDLSupport;
+using AdvancedDLSupport.Loaders;
 using Silk.NET.Core.Loader;
 
 namespace Silk.NET.Core.Native
@@ -12,12 +13,19 @@ namespace Silk.NET.Core.Native
     public abstract class NativeAPI : NativeLibraryBase
     {
         /// <inheritdoc />
-        protected NativeAPI(string path, ImplementationOptions options) : base(path, options)
+        protected NativeAPI
+        (
+            string path,
+            ImplementationOptions options,
+            ILibraryLoader libLoader = null,
+            ISymbolLoader symLoader = null
+        )
+        : base(path, options, libLoader, symLoader)
         {
         }
 
         public abstract SearchPathContainer SearchPaths { get; }
 
         public abstract bool IsExtensionPresent(string name);
     }
-}
+}
diff --git a/src/Core/Silk.NET.Core/Native/NativeExtension.cs b/src/Core/Silk.NET.Core/Native/NativeExtension.cs
@@ -4,12 +4,21 @@
 // of the MIT license. See the LICENSE file for details.
 
 using AdvancedDLSupport;
+using AdvancedDLSupport.Loaders;
 
 namespace Silk.NET.Core.Native
 {
     public abstract class NativeExtension<T> : NativeLibraryBase where T : NativeAPI
     {
-        protected NativeExtension(string path, ImplementationOptions options) : base(path, options)
+        /// <inheritdoc />
+        protected NativeExtension
+        (
+            string path,
+            ImplementationOptions options,
+            ILibraryLoader libLoader = null,
+            ISymbolLoader symLoader = null
+        )
+            : base(path, options, libLoader, symLoader)
         {
         }
     }

diff --git a/src/Core/Silk.NET.Core/Silk.NET.Core.csproj b/src/Core/Silk.NET.Core/Silk.NET.Core.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="AdvancedDLSupport" Version="3.0.0" />
+      <PackageReference Include="Ultz.Private.AdvancedDLSupport" Version="4.0.0" />
       <PackageReference Include="System.Numerics.Vectors" Version="4.6.0-preview5.19224.8" />
     </ItemGroup>
 

diff --git a/...ions/Silk.NET.OpenAL.Extensions.Enumeration/Silk.NET.OpenAL.Extensions.Enumeration.csproj b/...ions/Silk.NET.OpenAL.Extensions.Enumeration/Silk.NET.OpenAL.Extensions.Enumeration.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="System.Buffers" Version="4.5.0" />
-    <PackageReference Include="System.Memory" Version="4.5.1" />
   </ItemGroup>
 
   <Import Project="..\..\..\..\build\props\bindings.props" />

diff --git a/src/OpenAL/Silk.NET.OpenAL/AL/AL.cs b/src/OpenAL/Silk.NET.OpenAL/AL/AL.cs
@@ -17,6 +17,11 @@ namespace Silk.NET.OpenAL
     /// </summary>
     public abstract class AL : NativeAPI, IAL
     {
+        static AL()
+        {
+            LibraryLoader.CreateBuilder<AL>(ALLoader.Instance);
+        }
+
         /// <inheritdoc cref="NativeLibraryBase" />
         protected AL(string path, ImplementationOptions options)
             : base(path, options)

diff --git a/src/OpenAL/Silk.NET.OpenAL/AL/ALLoader.cs b/src/OpenAL/Silk.NET.OpenAL/AL/ALLoader.cs
@@ -0,0 +1,42 @@
+// 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 System;
+using AdvancedDLSupport;
+using AdvancedDLSupport.Loaders;
+
+namespace Silk.NET.OpenAL
+{
+    public class ALLoader : IPlatformLoader
+    {
+        [NativeSymbols(Prefix = "al")]
+        public interface IInternalAL
+        {
+            IntPtr GetProcAddress(string proc);
+        }
+
+        private static IInternalAL _al = NativeLibraryBuilder.Default.ActivateInterface<IInternalAL>
+        (
+            new OpenALLibraryNameContainer().GetLibraryName()
+        );
+
+        public static ALLoader Instance { get; } = new ALLoader();
+
+        public IntPtr LoadSymbol(IntPtr library, string symbolName)
+        {
+            return _al.GetProcAddress(symbolName);
+        }
+
+        public IntPtr LoadLibrary(string path)
+        {
+            return IntPtr.Zero;
+        }
+
+        public bool CloseLibrary(IntPtr library)
+        {
+            return true;
+        }
+    }
+}
diff --git a/src/OpenAL/Silk.NET.OpenAL/ALC/ALContext.cs b/src/OpenAL/Silk.NET.OpenAL/ALC/ALContext.cs
@@ -17,6 +17,12 @@ namespace Silk.NET.OpenAL
     /// </summary>
     public abstract class ALContext : NativeAPI, IALC
     {
+        static ALContext()
+        {
+            LibraryLoader.CreateBuilder<ALContext>(ALLoader.Instance);
+        }
+
+
         /// <inheritdoc cref="NativeLibraryBase" />
         protected ALContext(string path, ImplementationOptions options)
             : base(path, options)

diff --git a/src/OpenGL/Silk.NET.OpenGL.Legacy/Silk.NET.OpenGL.Legacy.csproj b/src/OpenGL/Silk.NET.OpenGL.Legacy/Silk.NET.OpenGL.Legacy.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Windowing\Silk.NET.Windowing\Silk.NET.Windowing.csproj" />
   </ItemGroup>
 
   <Import Project="..\..\..\build\props\bindings.props" />

diff --git a/src/OpenGL/Silk.NET.OpenGL/Silk.NET.OpenGL.csproj b/src/OpenGL/Silk.NET.OpenGL/Silk.NET.OpenGL.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Windowing\Silk.NET.Windowing\Silk.NET.Windowing.csproj" />
   </ItemGroup>
 
   <Import Project="..\..\..\build\props\bindings.props" />