SilkTouch work for 2.4 (#454)

* Remove ConcurrentDictionaryVTable

* Out with the trees!

* Split files

* Out with the threes part 2!

* Remove slots & cleanup

* Add fallback arm

* Adjust exception message

* Update src/Core/Silk.NET.Core/Native/NativeApiContainer.cs

Co-authored-by: Dylan Perks <[email protected]>

* Change how loading exceptions work

* Update src/Core/Silk.NET.Core/Native/NativeApiContainer.cs

Co-authored-by: Dylan Perks <[email protected]>

* Try to filter usings

* Cleanup Vk + XR

* Remove redundant code

* Fix some warnings

* enable telemetry

* Raise telemetry diagnostic to Warning

* Fix telemetry option

* Enable compact file format always

Co-authored-by: Dylan Perks <[email protected]>

Author: HurricanKai

.editorconfig

@@ -67,6 +67,8 @@ silk_touch_vtable_generate = true
 silk_touch_vtable_tree_emit_assert = true
 silk_touch_sealed_vtable_creation = true
 silk_touch_vtable_preload = false
+silk_touch_telemetry = false
+silk_touch_compact_file_format = true
 
 [*.{appxmanifest,asax,ascx,aspx,build,config,cs,cshtml,csproj,dbml,discomap,dtd,fs,fsi,fsscript,fsx,htm,html,jsproj,lsproj,master,ml,mli,njsproj,nuspec,proj,props,razor,resw,resx,skin,StyleCop,targets,tasks,vb,vbproj,xaml,xamlx,xml,xoml,xsd}]
 indent_style = space

src/Core/Silk.NET.Core/Contexts/INativeContext.cs

@@ -8,6 +8,7 @@ namespace Silk.NET.Core.Contexts
     public interface INativeContext : IDisposable
     {
         nint GetProcAddress(string proc, int? slot = default);
+        
         bool TryGetProcAddress(string proc, out nint addr, int? slot = default);
     }
 }

src/Core/Silk.NET.Core/Native/ConcurrentDictionaryVTable.cs

@@ -8,8 +8,9 @@ namespace Silk.NET.Core.Native
 {
     public interface IVTable : IDisposable
     {
-        void Initialize(INativeContext ctx, int maxSlots);
+        [Obsolete("Use method without slot - this method will be removed in 3.0")]
         nint Load(int slot, string entryPoint);
+        nint Load(string entryPoint);
         void Purge();
     }
 }

src/Core/Silk.NET.Core/Native/IVTable.cs

@@ -1,17 +1,18 @@
-// 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.
 
 #nullable enable
 using System;
 using System.Diagnostics;
 using System.Threading;
 using Silk.NET.Core.Contexts;
+using Silk.NET.Core.Loader;
 
 namespace Silk.NET.Core.Native
 {
     public abstract class NativeApiContainer : IDisposable
     {
-        private readonly INativeContext _ctx;
+        protected readonly INativeContext _ctx;
         private IVTable _vTable;
 
         protected NativeApiContainer(INativeContext ctx)
@@ -21,16 +22,6 @@ protected NativeApiContainer(INativeContext ctx)
             // The only implementer of this function should be SilkTouch
             // ReSharper disable VirtualMemberCallInConstructor
             _vTable = CreateVTable();
-            var slotCount = CoreGetSlotCount();
-            if (slotCount == 0)
-            {
-                throw new InvalidOperationException
-                (
-                    "The derived class does not implement CoreGetSlotCount, or does not have any slots." +
-                    "This could be because of a SilkTouch bug, or because you're not using SilkTouch at all."
-                );
-            }
-            _vTable.Initialize(_ctx, slotCount);
             GcUtility = new GcUtility(1, CoreGcSlotCount());
             PostInit();
             // ReSharper restore VirtualMemberCallInConstructor
@@ -46,10 +37,10 @@ public void Dispose()
             CurrentVTable.Dispose();
         }
 
-        protected virtual int CoreGetSlotCount() => 0;
         protected virtual int CoreGcSlotCount() => 0;
-        protected virtual IVTable CreateVTable() => new ConcurrentDictionaryVTable();
-        protected IVTable SwapVTable() => Interlocked.Exchange(ref _vTable, CreateVTable());
+        protected virtual IVTable CreateVTable()
+            => throw new NotImplementedException("Must be implemented by SilkTouch");
+        protected IVTable SwapVTable() => SwapVTable(CreateVTable());
         protected IVTable SwapVTable(IVTable newVTable) => Interlocked.Exchange(ref _vTable, newVTable);
 
         protected void Pin(object o, int slot = -1)
@@ -72,11 +63,24 @@ public void PurgeEntryPoints()
             CurrentVTable.Purge();
         }
 
+        [Obsolete("Use method without slot - this method will be removed in 3.0")]
         protected nint Load(int slot, string entryPoint)
         {
-            return CurrentVTable.Load(slot, entryPoint);
+            return Load(entryPoint);
+        }
+
+        protected nint Load(string entryPoint)
+        {
+            var result = CurrentVTable.Load(entryPoint);
+            if (result == 0)
+            {
+                ThrowSymbolLoadingEx(entryPoint);
+            }
+            return result;
         }
 
+        private static void ThrowSymbolLoadingEx(string symbol) => throw new SymbolLoadingException(symbol);
+
         protected virtual void PostInit()
         {
             // do nothing by default

src/Core/Silk.NET.Core/Native/NativeApiContainer.cs

@@ -53,9 +53,9 @@ internal static class Diagnostics
         (
             id: "ST0004",
             title: "Build Info",
-            messageFormat: "SlotCount: '{0}', GCSlotCount: '{1}', Time: '{2}'",
+            messageFormat: "GCSlotCount: '{0}', Time: '{1}'",
             category: "SilkTouch.Internal",
-            defaultSeverity: DiagnosticSeverity.Info, 
+            defaultSeverity: DiagnosticSeverity.Warning, 
             isEnabledByDefault: true,
             description: null,
             helpLinkUri: null,

src/Core/Silk.NET.SilkTouch/Diagnostics.cs

@@ -10,15 +10,13 @@ namespace Silk.NET.SilkTouch
     public readonly struct EntryPoint
     {
         public readonly string Name;
-        public readonly int Slot;
         public readonly CallingConvention CallingConvention;
         public readonly TypeSyntax[] LoadTypes;
         public readonly IMethodSymbol SourceSymbol;
 
-        public EntryPoint(string name, int slot, CallingConvention callingConvention, TypeSyntax[] loadTypes, IMethodSymbol sourceSymbol)
+        public EntryPoint(string name, CallingConvention callingConvention, TypeSyntax[] loadTypes, IMethodSymbol sourceSymbol)
         {
             Name = name;
-            Slot = slot;
             CallingConvention = callingConvention;
             LoadTypes = loadTypes;
             SourceSymbol = sourceSymbol;

src/Core/Silk.NET.SilkTouch/EntryPoint.cs

@@ -22,11 +22,6 @@ public interface IMarshalContext
         /// </summary>
         Compilation Compilation { get; }
 
-        /// <summary>
-        /// Indicates the method slot
-        /// </summary>
-        int Slot { get; }
-
         /// <summary>
         /// All Load types in order, last is the return type
         /// </summary>
@@ -165,9 +160,6 @@ public class MarshalContext : IMarshalContext
         /// <inheritdoc />
         public Compilation Compilation { get; }
 
-        /// <inheritdoc />
-        public int Slot { get; }
-
         /// <inheritdoc />
         public ITypeSymbol[] LoadTypes { get; }
 
@@ -498,11 +490,10 @@ public void TransitionTo(SilkTouchStage stage)
             CurrentStage = stage;
         }
 
-        public MarshalContext(Compilation compilation, IMethodSymbol methodSymbol, int slot)
+        public MarshalContext(Compilation compilation, IMethodSymbol methodSymbol)
         {
             Compilation = compilation;
             MethodSymbol = methodSymbol;
-            Slot = slot;
             ParameterVariables = new int[MethodSymbol.Parameters.Length];
 
             LoadTypes = MethodSymbol.Parameters.Select