ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-02 23:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made extension loading more forgiving (delegates can be either public or non-public now).

Browse source
This commit is contained in:
the_fiddler 2009-03-07 10:20:55 +00:00
parent 70963b09af
commit 4cfaaf6077
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Source/OpenTK/Platform/Utilities.cs
View file

@ -76,15 +76,15 @@ namespace OpenTK.Platform
// than with reflection, but the first time is more significant. // than with reflection, but the first time is more significant.
int supported = 0; int supported = 0;
Type extensions_class = type.GetNestedType("Delegates", BindingFlags.Static | BindingFlags.NonPublic); Type extensions_class = type.GetNestedType("Delegates", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (extensions_class == null) if (extensions_class == null)
throw new InvalidOperationException("The specified type does not have any loadable extensions."); throw new InvalidOperationException("The specified type does not have any loadable extensions.");
FieldInfo[] delegates = extensions_class.GetFields(BindingFlags.Static | BindingFlags.NonPublic); FieldInfo[] delegates = extensions_class.GetFields(BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (delegates == null) if (delegates == null)
throw new InvalidOperationException("The specified type does not have any loadable extensions."); throw new InvalidOperationException("The specified type does not have any loadable extensions.");
MethodInfo load_delegate_method_info = type.GetMethod("LoadDelegate", BindingFlags.Static | BindingFlags.NonPublic); MethodInfo load_delegate_method_info = type.GetMethod("LoadDelegate", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (load_delegate_method_info == null) if (load_delegate_method_info == null)
throw new InvalidOperationException(type.ToString() + " does not contain a static LoadDelegate method."); throw new InvalidOperationException(type.ToString() + " does not contain a static LoadDelegate method.");
LoadDelegateFunction LoadDelegate = (LoadDelegateFunction)Delegate.CreateDelegate( LoadDelegateFunction LoadDelegate = (LoadDelegateFunction)Delegate.CreateDelegate(
@ -105,7 +105,7 @@ namespace OpenTK.Platform
f.SetValue(null, d); f.SetValue(null, d);
} }
FieldInfo rebuildExtensionList = type.GetField("rebuildExtensionList", BindingFlags.Static | BindingFlags.NonPublic); FieldInfo rebuildExtensionList = type.GetField("rebuildExtensionList", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (rebuildExtensionList != null) if (rebuildExtensionList != null)
rebuildExtensionList.SetValue(null, true); rebuildExtensionList.SetValue(null, true);
@ -116,7 +116,7 @@ namespace OpenTK.Platform
#endregion #endregion
#region internal static void LoadExtension() #region internal static bool TryLoadExtension(Type type, string extension)
/// <internal /> /// <internal />
/// <summary>Loads the specified extension for the specified class. This function is intended /// <summary>Loads the specified extension for the specified class. This function is intended
@ -134,7 +134,7 @@ namespace OpenTK.Platform
/// </remarks> /// </remarks>
internal static bool TryLoadExtension(Type type, string extension) internal static bool TryLoadExtension(Type type, string extension)
{ {
Type extensions_class = type.GetNestedType("Delegates", BindingFlags.Static | BindingFlags.NonPublic); Type extensions_class = type.GetNestedType("Delegates", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (extensions_class == null) if (extensions_class == null)
{ {
Debug.Print(type.ToString(), " does not contain extensions."); Debug.Print(type.ToString(), " does not contain extensions.");
@ -142,14 +142,14 @@ namespace OpenTK.Platform
} }
LoadDelegateFunction LoadDelegate = (LoadDelegateFunction)Delegate.CreateDelegate(typeof(LoadDelegateFunction), LoadDelegateFunction LoadDelegate = (LoadDelegateFunction)Delegate.CreateDelegate(typeof(LoadDelegateFunction),
type.GetMethod("LoadDelegate", BindingFlags.Static | BindingFlags.NonPublic)); type.GetMethod("LoadDelegate", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public));
if (LoadDelegate == null) if (LoadDelegate == null)
{ {
Debug.Print(type.ToString(), " does not contain a static LoadDelegate method."); Debug.Print(type.ToString(), " does not contain a static LoadDelegate method.");
return false; return false;
} }
FieldInfo f = extensions_class.GetField(extension, BindingFlags.Static | BindingFlags.NonPublic); FieldInfo f = extensions_class.GetField(extension, BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (f == null) if (f == null)
{ {
Debug.Print("Extension \"", extension, "\" not found in ", type.ToString()); Debug.Print("Extension \"", extension, "\" not found in ", type.ToString());
@ -161,7 +161,7 @@ namespace OpenTK.Platform
if (old.Target != @new.Target) if (old.Target != @new.Target)
{ {
f.SetValue(null, @new); f.SetValue(null, @new);
FieldInfo rebuildExtensionList = type.GetField("rebuildExtensionList", BindingFlags.Static | BindingFlags.NonPublic); FieldInfo rebuildExtensionList = type.GetField("rebuildExtensionList", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
if (rebuildExtensionList != null) if (rebuildExtensionList != null)
rebuildExtensionList.SetValue(null, true); rebuildExtensionList.SetValue(null, true);
} }