Fix dotnet#2149 (dotnet#2237)

Perksey · web-flow · commit b079b28cd51c · 2024-07-14T22:01:36.000-05:00
* Fix dotnet#2149 * Update MultiNativeContext.cs * Update MultiNativeContext.cs
diff --git a/src/Core/Silk.NET.Core/Contexts/MultiNativeContext.cs b/src/Core/Silk.NET.Core/Contexts/MultiNativeContext.cs
@@ -4,6 +4,7 @@
 #nullable enable
 using System;
 using System.Linq;
+using Silk.NET.Core.Loader;
 
 namespace Silk.NET.Core.Contexts
 {
@@ -30,16 +31,13 @@ public MultiNativeContext(params INativeContext?[] contexts)
         /// <inheritdoc />
         public nint GetProcAddress(string proc, int? slot = default)
         {
-            foreach (var nativeContext in Contexts)
+            if (!TryGetProcAddress(proc, out var ret, slot))
             {
-                var ret = nativeContext?.GetProcAddress(proc, slot) ?? default;
-                if (ret != default)
-                {
-                    return ret;
-                }
+                static void Throw(string fn) => throw new SymbolLoadingException(fn);
+                Throw(proc);
             }
 
-            return default;
+            return ret;
         }
 
         /// <inheritdoc />

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#nullable enable`
`5`	`5`	`using System;`
`6`	`6`	`using System.Linq;`
	`7`	`+using Silk.NET.Core.Loader;`
`7`	`8`
`8`	`9`	`namespace Silk.NET.Core.Contexts`
`9`	`10`	`{`
`@@ -30,16 +31,13 @@ public MultiNativeContext(params INativeContext?[] contexts)`
`30`	`31`	`/// <inheritdoc />`
`31`	`32`	`public nint GetProcAddress(string proc, int? slot = default)`
`32`	`33`	`{`
`33`		`- foreach (var nativeContext in Contexts)`
	`34`	`+ if (!TryGetProcAddress(proc, out var ret, slot))`
`34`	`35`	`{`
`35`		`- var ret = nativeContext?.GetProcAddress(proc, slot) ?? default;`
`36`		`- if (ret != default)`
`37`		`- {`
`38`		`- return ret;`
`39`		`- }`
	`36`	`+ static void Throw(string fn) => throw new SymbolLoadingException(fn);`
	`37`	`+ Throw(proc);`
`40`	`38`	`}`
`41`	`39`
`42`		`- return default;`
	`40`	`+ return ret;`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`/// <inheritdoc />`