ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-24 07:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now initializes GL class. Slight layout improvements. Removed useless constructors.

Browse source
This commit is contained in:
the_fiddler 2007-11-04 15:37:41 +00:00
parent 31672f0303
commit e633395202
1 changed files with 26 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,57 +29,39 @@ namespace OpenTK.Platform.X11
#region --- Constructors --- #region --- Constructors ---
internal X11GLContext() : this(new DisplayMode(), new WindowInfo())
{
}
internal X11GLContext(DisplayMode mode) : this(mode, new WindowInfo())
{
}
public X11GLContext(DisplayMode mode, IWindowInfo info) public X11GLContext(DisplayMode mode, IWindowInfo info)
{ {
if (info == null) if (info == null)
throw new ArgumentNullException("IWindowInfo cannot be null."); throw new ArgumentNullException("IWindowInfo cannot be null.");
this.windowInfo = info as WindowInfo; this.windowInfo = new WindowInfo(info);
if (this.windowInfo == null)
throw new Exception("Problem");
this.mode = mode; this.mode = mode;
this.ChooseContext(); this.ChooseContext();
} }
#endregion #endregion
//#region private XVisualInfo VisualInfo #region private void ChooseContext()
//private XVisualInfo VisualInfo
//{
// get { return windowInfo.VisualInfo; }
//}
//#endregion
//#region private IntPtr Handle
//private IntPtr Handle
//{
// get { return windowInfo.Handle; }
// set { windowInfo.Handle = value; }
//}
//#endregion
#region private void PrepareContext()
private void ChooseContext() private void ChooseContext()
{ {
List<int> visualAttributes = new List<int>(); List<int> visualAttributes = new List<int>();
if (mode == null) // TODO: Improve modesetting code.
if (mode == null || mode.Color.BitsPerPixel == 0)
{ {
// Define the bare essentials - needed for compatibility with Mono's System.Windows.Forms // Define the bare essentials - needed for compatibility with Mono's System.Windows.Forms
Debug.Print("Preparing visual for System.Windows.Forms (compatibility mode)"); Debug.Print("Preparing visual for System.Windows.Forms (compatibility mode)");
visualAttributes.Add((int)Glx.Enums.GLXAttribute.RGBA); visualAttributes.Add((int)Glx.Enums.GLXAttribute.RGBA);
visualAttributes.Add((int)Glx.Enums.GLXAttribute.RED_SIZE);
visualAttributes.Add((int)1);
visualAttributes.Add((int)Glx.Enums.GLXAttribute.GREEN_SIZE);
visualAttributes.Add((int)1);
visualAttributes.Add((int)Glx.Enums.GLXAttribute.BLUE_SIZE);
visualAttributes.Add((int)1);
visualAttributes.Add((int)Glx.Enums.GLXAttribute.DEPTH_SIZE); visualAttributes.Add((int)Glx.Enums.GLXAttribute.DEPTH_SIZE);
visualAttributes.Add((int)1); visualAttributes.Add((int)1);
visualAttributes.Add((int)Glx.Enums.GLXAttribute.DOUBLEBUFFER); visualAttributes.Add((int)Glx.Enums.GLXAttribute.DOUBLEBUFFER);
@ -107,12 +89,13 @@ namespace OpenTK.Platform.X11
visual = Glx.ChooseVisual(windowInfo.Display, windowInfo.Screen, visualAttributes.ToArray()); visual = Glx.ChooseVisual(windowInfo.Display, windowInfo.Screen, visualAttributes.ToArray());
if (visual == IntPtr.Zero) if (visual == IntPtr.Zero)
{ {
throw new ApplicationException(String.Format("Requested DisplayMode not available ({0}).", mode.ToString())); throw new ApplicationException("Could not create requested DisplayMode.");
} }
else else
{ {
windowInfo.VisualInfo = (XVisualInfo)Marshal.PtrToStructure(visual, typeof(XVisualInfo)); windowInfo.VisualInfo = (XVisualInfo)Marshal.PtrToStructure(visual,
Debug.Print("Prepared visual: {0}", windowInfo.VisualInfo.ToString()); typeof(XVisualInfo));
Debug.Print("Chose visual {0}", windowInfo.VisualInfo.ToString());
} }
} }
@ -138,13 +121,9 @@ namespace OpenTK.Platform.X11
private set private set
{ {
if (context == IntPtr.Zero) if (context == IntPtr.Zero)
{
mode = value; mode = value;
}
else else
{
Debug.Print("Cannot change DisplayMode of an existing context."); Debug.Print("Cannot change DisplayMode of an existing context.");
}
} }
} }
@ -188,6 +167,11 @@ namespace OpenTK.Platform.X11
if (context != IntPtr.Zero) if (context != IntPtr.Zero)
{ {
Debug.Print("New opengl context created. (id: {0})", context); Debug.Print("New opengl context created. (id: {0})", context);
this.MakeCurrent();
GL.LoadAll();
Glu.LoadAll();
return; return;
} }
// Context creation failed. Retry with a non-shared context with the // Context creation failed. Retry with a non-shared context with the
@ -198,6 +182,11 @@ namespace OpenTK.Platform.X11
if (context != IntPtr.Zero) if (context != IntPtr.Zero)
{ {
Debug.Print("New opengl context created. (id: {0})", context); Debug.Print("New opengl context created. (id: {0})", context);
this.MakeCurrent();
GL.LoadAll();
Glu.LoadAll();
return; return;
} }