From 37e8bbdaedc7bc1c2b5a1f70c3a7da23e5d9b55d Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Mon, 13 Sep 2021 09:39:27 +0100 Subject: [PATCH 1/3] Try to fix DllNotFoundException under .net 6 --- OpenTK.props | 2 +- Source/OpenTK/Graphics/ES20.Android/Helper.cs | 2 +- Source/OpenTK/Graphics/ES20/Helper.cs | 2 +- Source/OpenTK/Graphics/ES30.Android/Helper.cs | 2 +- Source/OpenTK/Graphics/ES31.Android/Helper.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenTK.props b/OpenTK.props index 56e8eac35..7e6679e29 100644 --- a/OpenTK.props +++ b/OpenTK.props @@ -1,5 +1,5 @@ - <_OpenTKNugetVersion>1.0.0 + <_OpenTKNugetVersion>1.0.1 \ No newline at end of file diff --git a/Source/OpenTK/Graphics/ES20.Android/Helper.cs b/Source/OpenTK/Graphics/ES20.Android/Helper.cs index 6603ad125..b0649a0fd 100644 --- a/Source/OpenTK/Graphics/ES20.Android/Helper.cs +++ b/Source/OpenTK/Graphics/ES20.Android/Helper.cs @@ -37,7 +37,7 @@ namespace OpenTK.Graphics.ES20 /// public sealed partial class GL : GraphicsBindingsBase { - public const string Library = "libGLESv2.dll"; + public const string Library = "libGLESv2"; static readonly object sync_root = new object(); #region --- Protected Members --- diff --git a/Source/OpenTK/Graphics/ES20/Helper.cs b/Source/OpenTK/Graphics/ES20/Helper.cs index 17aee7719..c65b33f8b 100644 --- a/Source/OpenTK/Graphics/ES20/Helper.cs +++ b/Source/OpenTK/Graphics/ES20/Helper.cs @@ -37,7 +37,7 @@ namespace OpenTK.Graphics.ES20 /// public sealed partial class GL : GraphicsBindingsBase { - public const string Library = "libGLESv2.dll"; + public const string Library = "libGLESv2"; static readonly object sync_root = new object(); #region --- Protected Members --- diff --git a/Source/OpenTK/Graphics/ES30.Android/Helper.cs b/Source/OpenTK/Graphics/ES30.Android/Helper.cs index 1f0b12fc0..7b657479f 100644 --- a/Source/OpenTK/Graphics/ES30.Android/Helper.cs +++ b/Source/OpenTK/Graphics/ES30.Android/Helper.cs @@ -37,7 +37,7 @@ namespace OpenTK.Graphics.ES30 /// public sealed partial class GL : GraphicsBindingsBase { - public const string Library = "libGLESv2.dll"; + public const string Library = "libGLESv3"; static readonly object sync_root = new object(); #region --- Protected Members --- diff --git a/Source/OpenTK/Graphics/ES31.Android/Helper.cs b/Source/OpenTK/Graphics/ES31.Android/Helper.cs index 26e71bb2a..b85d5055e 100644 --- a/Source/OpenTK/Graphics/ES31.Android/Helper.cs +++ b/Source/OpenTK/Graphics/ES31.Android/Helper.cs @@ -37,7 +37,7 @@ namespace OpenTK.Graphics.ES31 /// public sealed partial class GL : GraphicsBindingsBase { - public const string Library = "libGLESv2.dll"; + public const string Library = "libGLESv3"; static readonly object sync_root = new object(); #region --- Protected Members --- From 30ec2c1ffd5cf64b51cb07f669c1d8922b50a928 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 16 Sep 2021 11:41:56 +0100 Subject: [PATCH 2/3] Fix GLESv1 --- Source/OpenTK/Graphics/ES10.Android/Helper.cs | 2 +- Source/OpenTK/Graphics/ES11.Android/Helper.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/OpenTK/Graphics/ES10.Android/Helper.cs b/Source/OpenTK/Graphics/ES10.Android/Helper.cs index 5617c9db2..51f174f02 100644 --- a/Source/OpenTK/Graphics/ES10.Android/Helper.cs +++ b/Source/OpenTK/Graphics/ES10.Android/Helper.cs @@ -11,7 +11,7 @@ namespace OpenTK.Graphics.ES10 /// public sealed partial class GL : GraphicsBindingsBase { - public const string Library = "libGLESv1_CM.dll"; + public const string Library = "libGLESv1_CM"; static readonly object sync_root = new object(); #region --- Protected Members --- diff --git a/Source/OpenTK/Graphics/ES11.Android/Helper.cs b/Source/OpenTK/Graphics/ES11.Android/Helper.cs index fce601932..44918124d 100644 --- a/Source/OpenTK/Graphics/ES11.Android/Helper.cs +++ b/Source/OpenTK/Graphics/ES11.Android/Helper.cs @@ -14,7 +14,7 @@ namespace OpenTK.Graphics.ES11 public sealed partial class GL : GraphicsBindingsBase { - public const string Library = "libGLESv1_CM.dll"; + public const string Library = "libGLESv1_CM"; static readonly object sync_root = new object(); #region --- Protected Members --- From c5d845994c2e04e74501d5b82cda793cdb64765c Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 16 Sep 2021 15:07:17 +0100 Subject: [PATCH 3/3] Fix Default Library value --- Source/OpenTK/Graphics/ES10/Helper.cs | 2 +- Source/OpenTK/Graphics/ES11/Helper.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/OpenTK/Graphics/ES10/Helper.cs b/Source/OpenTK/Graphics/ES10/Helper.cs index 16f87c7c2..9f2ba36f3 100644 --- a/Source/OpenTK/Graphics/ES10/Helper.cs +++ b/Source/OpenTK/Graphics/ES10/Helper.cs @@ -9,7 +9,7 @@ namespace OpenTK.Graphics.ES10 /// public sealed partial class GL : GraphicsBindingsBase { - const string Library = "libGLES.dll"; + const string Library = "libGLES"; static readonly object sync_root = new object(); #region --- Protected Members --- diff --git a/Source/OpenTK/Graphics/ES11/Helper.cs b/Source/OpenTK/Graphics/ES11/Helper.cs index f77dd793c..89973cddc 100644 --- a/Source/OpenTK/Graphics/ES11/Helper.cs +++ b/Source/OpenTK/Graphics/ES11/Helper.cs @@ -12,7 +12,7 @@ namespace OpenTK.Graphics.ES11 public sealed partial class GL : GraphicsBindingsBase { - public const string Library = "libGLES.dll"; + public const string Library = "libGLES"; static readonly object sync_root = new object(); #region --- Protected Members ---