mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-23 12:15:37 +00:00
Corrected a bug where GL.LoadAll wasn't called on time in X11GLNative.
Moved MakeCurrent call to X11GLNative and WinGLNative, instead of GameWindow.
This commit is contained in:
parent
fcc621c9e5
commit
951f14f459
|
@ -212,7 +212,7 @@ namespace OpenTK
|
||||||
Debug.Print(expt.ToString());
|
Debug.Print(expt.ToString());
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
OpenTK.OpenGL.GL.LoadAll();
|
//OpenTK.OpenGL.GL.LoadAll();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -290,6 +290,8 @@ namespace OpenTK.Platform.Windows
|
||||||
glContext = new WinGLContext(this.mode);
|
glContext = new WinGLContext(this.mode);
|
||||||
glContext.PrepareContext(this.Handle);
|
glContext.PrepareContext(this.Handle);
|
||||||
glContext.CreateContext();
|
glContext.CreateContext();
|
||||||
|
//glContext.MakeCurrent();
|
||||||
|
OpenTK.OpenGL.GL.LoadAll();
|
||||||
}
|
}
|
||||||
catch (ApplicationException expt)
|
catch (ApplicationException expt)
|
||||||
{
|
{
|
||||||
|
|
|
@ -309,6 +309,8 @@ namespace OpenTK.Platform.X11
|
||||||
|
|
||||||
API.MapRaised(window.Display, window.Handle);
|
API.MapRaised(window.Display, window.Handle);
|
||||||
|
|
||||||
|
OpenTK.OpenGL.GL.LoadAll();
|
||||||
|
|
||||||
Debug.Unindent();
|
Debug.Unindent();
|
||||||
Debug.WriteLine("GameWindow creation completed successfully!");
|
Debug.WriteLine("GameWindow creation completed successfully!");
|
||||||
exists = true;
|
exists = true;
|
||||||
|
|
Loading…
Reference in a new issue