ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 16:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove static init of GetCurrentContext

Browse source 
The static initializer of GetCurrentContext would always default to the
desktop PlatformFactory, which caused problems when trying to run OpenGL
ES code on the desktop. The initializer is now removed and
GetCurrentContext is set in the context constructor, before creating any
contexts.
This commit is contained in:
Stefanos A 2013-11-08 10:41:58 +01:00
parent 440e3fe248
commit ec2c64ee15
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/OpenTK/Graphics/GraphicsContext.cs
View file

@ -131,7 +131,6 @@ namespace OpenTK.Graphics
case true: factory = Factory.Embedded; break; case true: factory = Factory.Embedded; break;
} }
implementation = factory.CreateGLContext(mode, window, shareContext, direct_rendering, major, minor, flags);
// Note: this approach does not allow us to mix native and EGL contexts in the same process. // Note: this approach does not allow us to mix native and EGL contexts in the same process.
// This should not be a problem, as this use-case is not interesting for regular applications. // This should not be a problem, as this use-case is not interesting for regular applications.
// Note 2: some platforms may not support a direct way of getting the current context // Note 2: some platforms may not support a direct way of getting the current context
@ -140,12 +139,10 @@ namespace OpenTK.Graphics
// declaration). // declaration).
if (GetCurrentContext == null) if (GetCurrentContext == null)
{ {
GetCurrentContextDelegate temp = factory.CreateGetCurrentGraphicsContext(); GetCurrentContext = factory.CreateGetCurrentGraphicsContext();
if (temp != null)
{
GetCurrentContext = temp;
}
} }
implementation = factory.CreateGLContext(mode, window, shareContext, direct_rendering, major, minor, flags);
} }
available_contexts.Add((this as IGraphicsContextInternal).Context, new WeakReference(this)); available_contexts.Add((this as IGraphicsContextInternal).Context, new WeakReference(this));
@ -321,8 +318,7 @@ namespace OpenTK.Graphics
#region public static IGraphicsContext CurrentContext #region public static IGraphicsContext CurrentContext
internal delegate ContextHandle GetCurrentContextDelegate(); internal delegate ContextHandle GetCurrentContextDelegate();
internal static GetCurrentContextDelegate GetCurrentContext = internal static GetCurrentContextDelegate GetCurrentContext;
Platform.Factory.Default.CreateGetCurrentGraphicsContext();
/// <summary> /// <summary>
/// Gets the GraphicsContext that is current in the calling thread. /// Gets the GraphicsContext that is current in the calling thread.