ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-09 08:30:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed X11GLContext.MakeCurrent. X11GLControl was not setting the handle correctly.

Browse source
This commit is contained in:
the_fiddler 2007-08-09 12:14:00 +00:00
parent f98b344cdf
commit 9cd1ca9a67
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/OpenTK/Platform/X11/WindowInfo.cs
View file

@ -16,13 +16,14 @@ namespace OpenTK.Platform.X11
} }
internal WindowInfo(WindowInfo parent) internal WindowInfo(WindowInfo parent)
{ {
this.Handle = parent.Handle;
this.TopLevelWindow = parent.TopLevelWindow; this.TopLevelWindow = parent.TopLevelWindow;
this.Screen = parent.Screen; this.Screen = parent.Screen;
this.Display = parent.Display; this.Display = parent.Display;
this.RootWindow = parent.RootWindow; this.RootWindow = parent.RootWindow;
this.VisualInfo = parent.VisualInfo; this.VisualInfo = parent.VisualInfo;
this.Parent = parent; this.Parent = parent;
} }
private IntPtr rootWindow, handle, topLevelWindow, display; private IntPtr rootWindow, handle, topLevelWindow, display;

5
Source/OpenTK/Platform/X11/X11GLContext.cs
View file

@ -69,10 +69,11 @@ namespace OpenTK.Platform.X11
{ {
Debug.Write( Debug.Write(
String.Format( String.Format(
"Making context {0} current on thread {1} (display: {2}, window: {3})... ", "Making context {0} current on thread {1} (Display: {2}, Screen: {3}, Window: {4})... ",
x11context, x11context,
System.Threading.Thread.CurrentThread.ManagedThreadId, System.Threading.Thread.CurrentThread.ManagedThreadId,
windowInfo.Display, windowInfo.Display,
windowInfo.Screen,
windowInfo.Handle windowInfo.Handle
) )
); );

4
Source/OpenTK/Platform/X11/X11GLControl.cs
View file

@ -67,9 +67,9 @@ namespace OpenTK.Platform.X11
System.Reflection.BindingFlags.NonPublic).GetValue(null); System.Reflection.BindingFlags.NonPublic).GetValue(null);
Debug.Print( Debug.Print(
"Screen: {0}, Display: {1}, Root Window: {2}, Control: {3}", "Screen: {0}, Display: {1}, Root Window: {2}, Handle: {3}",
info.Screen, info.Display, info.RootWindow, info.Handle); info.Screen, info.Display, info.RootWindow, info.Handle);
glContext = new X11GLContext(info, mode); glContext = new X11GLContext(info, mode);
info.VisualInfo = glContext.CreateVisual(); info.VisualInfo = glContext.CreateVisual();