ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 18:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added new GLControl constructors that allow you specify the desired GraphicsContext (OpenGL) version and flags.

Browse source
This commit is contained in:
the_fiddler 2009-03-07 11:03:41 +00:00
parent 0759beaebf
commit fda108701c
6 changed files with 59 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
Source/OpenTK/GLControl.cs
View file

@ -30,8 +30,10 @@ namespace OpenTK
IGLControl implementation;
GraphicsMode format;
IWindowInfo window_info;
int major, minor;
GraphicsContextFlags flags;
#region --- Constructor ---
#region --- Constructors ---
/// <summary>
/// Constructs a new GLControl.
@ -40,18 +42,22 @@ namespace OpenTK
: this(GraphicsMode.Default)
{ }
/// <summary>This method is obsolete and will be removed in future versions.</summary>
/// <param name="mode">Obsolete.</param>
[Obsolete]
public GLControl(DisplayMode mode)
: this(mode.ToGraphicsMode())
/// <summary>
/// Constructs a new GLControl with the specified GraphicsMode.
/// </summary>
/// <param name="mode">The OpenTK.Graphics.GraphicsMode of the control.</param>
public GLControl(GraphicsMode mode)
: this(mode, 1, 0, GraphicsContextFlags.Default)
{ }
/// <summary>
/// Constructs a new GLControl with the specified GraphicsMode.
/// </summary>
/// <param name="mode">The OpenTK.Graphics.GraphicsMode of the control.</param>
public GLControl(GraphicsMode mode)
/// <param name="major">The major version for the OpenGL GraphicsContext.</param>
/// <param name="major">The minor version for the OpenGL GraphicsContext.</param>
/// <param name="major">The GraphicsContextFlags for the OpenGL GraphicsContext.</param>
public GLControl(GraphicsMode mode, int major, int minor, GraphicsContextFlags flags)
{
SetStyle(ControlStyles.Opaque, true);
SetStyle(ControlStyles.UserPaint, true);
@ -61,6 +67,9 @@ namespace OpenTK
InitializeComponent();
this.format = mode;
this.major = major;
this.minor = minor;
this.flags = flags;
// On Windows, you first need to create the window, then set the pixel format.
// On X11, you first need to select the visual, then create the window.
@ -77,22 +86,18 @@ namespace OpenTK
this.CreateControl();
}
#region Obsolete
/// <summary>This method is obsolete and will be removed in future versions.</summary>
/// <param name="mode">Obsolete.</param>v
[Obsolete]
public GLControl(DisplayMode mode)
: this(mode.ToGraphicsMode())
{ }
#endregion
protected override void OnResize(EventArgs e)
{
if (context != null)
context.Update(window_info);
base.OnResize(e);
}
protected override void OnParentChanged(EventArgs e)
{
if (context != null)
context.Update(window_info);
base.OnParentChanged(e);
}
#endregion
#region --- Protected Methods ---
@ -102,7 +107,7 @@ namespace OpenTK
{
base.OnHandleCreated(e);
this.Context = implementation.CreateContext();
this.Context = implementation.CreateContext(major, minor, flags);
this.window_info = implementation.WindowInfo;
this.MakeCurrent();
@ -133,6 +138,30 @@ namespace OpenTK
base.OnPaint(e);
}
/// <summary>
/// Raises the Resize event.
/// </summary>
/// <param name="e">A System.EventArgs that contains the event data.</param>
protected override void OnResize(EventArgs e)
{
if (context != null)
context.Update(window_info);
base.OnResize(e);
}
/// <summary>
/// Raises the ParentChanged event.
/// </summary>
/// <param name="e">A System.EventArgs that contains the event data.</param>
protected override void OnParentChanged(EventArgs e)
{
if (context != null)
context.Update(window_info);
base.OnParentChanged(e);
}
#endregion
#region --- Public Methods ---

2
Source/OpenTK/Platform/Dummy/DummyGLControl.cs
View file

@ -6,7 +6,7 @@ namespace OpenTK.Platform.Dummy
{
#region IGLControl Members
public OpenTK.Graphics.GraphicsContext CreateContext()
public OpenTK.Graphics.GraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags)
{
return new GraphicsContext(null, null);
}

2
Source/OpenTK/Platform/IGLControl.cs
View file

@ -16,7 +16,7 @@ namespace OpenTK.Platform
{
internal interface IGLControl
{
GraphicsContext CreateContext();
GraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags);
bool IsIdle { get; }
IWindowInfo WindowInfo { get; }
}

4
Source/OpenTK/Platform/MacOS/CarbonGLControl.cs
View file

@ -20,9 +20,9 @@ namespace OpenTK.Platform.MacOS
#region IGLControl Members
public OpenTK.Graphics.GraphicsContext CreateContext()
public OpenTK.Graphics.GraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags)
{
return new GraphicsContext(mode, WindowInfo);
return new GraphicsContext(mode, WindowInfo, major, minor, flags);
}
// TODO: Fix this

4
Source/OpenTK/Platform/Windows/WinGLControl.cs
View file

@ -29,10 +29,10 @@ namespace OpenTK.Platform.Windows
#region --- IGLControl Members ---
public GraphicsContext CreateContext()
public GraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags)
{
WinWindowInfo window = new WinWindowInfo(control.Handle, null);
return new GraphicsContext(mode, window);
return new GraphicsContext(mode, window, major, minor, flags);
}
public bool IsIdle

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

@ -44,9 +44,9 @@ namespace OpenTK.Platform.X11
#region --- IGLControl Members ---
public GraphicsContext CreateContext()
public GraphicsContext CreateContext(int major, int minor, GraphicsContextFlags flags)
{
return new GraphicsContext(mode, this.WindowInfo);
return new GraphicsContext(mode, this.WindowInfo, major, minor, flags);
}
public bool IsIdle