From d6779d986d9822140b4667298670aaa67616e08c Mon Sep 17 00:00:00 2001 From: Jonas Boesch Date: Wed, 4 Mar 2015 11:50:12 +0100 Subject: [PATCH] GetStaticAddess checks for RenderableFlags.ES3 --- Source/OpenTK/Platform/Egl/EglUnixContext.cs | 10 +++++----- Source/OpenTK/Platform/Egl/EglWinContext.cs | 16 +++++++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Source/OpenTK/Platform/Egl/EglUnixContext.cs b/Source/OpenTK/Platform/Egl/EglUnixContext.cs index 94eb2e43..d2f82008 100644 --- a/Source/OpenTK/Platform/Egl/EglUnixContext.cs +++ b/Source/OpenTK/Platform/Egl/EglUnixContext.cs @@ -53,14 +53,14 @@ namespace OpenTK.Platform.Egl protected override IntPtr GetStaticAddress(IntPtr function, RenderableFlags renderable) { - if ((renderable & RenderableFlags.ES) != 0 && ES1 != IntPtr.Zero) - { - return X11.DL.Symbol(ES1, function); - } - else if ((renderable & RenderableFlags.ES2) != 0 && ES2 != IntPtr.Zero) + if ((renderable & (RenderableFlags.ES2 | RenderableFlags.ES3)) != 0 && ES2 != IntPtr.Zero) { return X11.DL.Symbol(ES2, function); } + else if ((renderable & RenderableFlags.ES) != 0 && ES1 != IntPtr.Zero) + { + return X11.DL.Symbol(ES1, function); + } else if ((renderable & RenderableFlags.GL) != 0 && GL != IntPtr.Zero) { return X11.DL.Symbol(GL, function); diff --git a/Source/OpenTK/Platform/Egl/EglWinContext.cs b/Source/OpenTK/Platform/Egl/EglWinContext.cs index 9c6ee616..86d736cf 100644 --- a/Source/OpenTK/Platform/Egl/EglWinContext.cs +++ b/Source/OpenTK/Platform/Egl/EglWinContext.cs @@ -34,8 +34,8 @@ namespace OpenTK.Platform.Egl { class EglWinContext : EglContext { - readonly IntPtr ES1 = OpenTK.Platform.Windows.Functions.LoadLibrary("libGLESv1_CM"); - readonly IntPtr ES2 = OpenTK.Platform.Windows.Functions.LoadLibrary("libGLESv2"); + IntPtr ES1 = OpenTK.Platform.Windows.Functions.LoadLibrary("libGLESv1_CM"); + IntPtr ES2 = OpenTK.Platform.Windows.Functions.LoadLibrary("libGLESv2"); public EglWinContext(GraphicsMode mode, EglWindowInfo window, IGraphicsContext sharedContext, int major, int minor, GraphicsContextFlags flags) @@ -53,14 +53,14 @@ namespace OpenTK.Platform.Egl protected override IntPtr GetStaticAddress(IntPtr function, RenderableFlags renderable) { - if ((renderable & RenderableFlags.ES) != 0 && ES1 != IntPtr.Zero) - { - return Windows.Functions.GetProcAddress(ES1, function); - } - else if ((renderable & RenderableFlags.ES2) != 0 && ES2 != IntPtr.Zero) + if ((renderable & (RenderableFlags.ES2 | RenderableFlags.ES3)) != 0 && ES2 != IntPtr.Zero) { return Windows.Functions.GetProcAddress(ES2, function); } + else if ((renderable & RenderableFlags.ES) != 0 && ES1 != IntPtr.Zero) + { + return Windows.Functions.GetProcAddress(ES1, function); + } return IntPtr.Zero; } @@ -75,6 +75,8 @@ namespace OpenTK.Platform.Egl Windows.Functions.FreeLibrary(ES2); } + ES1 = ES2 = IntPtr.Zero; + base.Dispose(manual); }