ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/thefiddler/opentk

Browse source
This commit is contained in:
thefiddler 2013-11-12 02:03:46 +01:00
commit 5e502ce02d
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Examples/Main.cs
View file

@ -85,8 +85,6 @@ namespace Examples
public static void Main(string[] args) public static void Main(string[] args)
{ {
Trace.Listeners.Add(new ConsoleTraceListener()); Trace.Listeners.Add(new ConsoleTraceListener());
LaunchExample(typeof(Examples.Tests.GameWindowStates).FullName);
return;
if (args.Length > 0) if (args.Length > 0)
{ {

6
Source/Examples/OpenGLES/2.0/SimpleWindow20.cs
View file

@ -24,7 +24,7 @@ namespace Examples.Tutorial
#region Constructor #region Constructor
public SimpleES20Window(GraphicsContextFlags flags) public SimpleES20Window(GraphicsContextFlags flags)
: base(800, 600, new GraphicsMode(16, 16), "", GameWindowFlags.Default, DisplayDevice.Default, 2, 0, flags) : base(800, 600, GraphicsMode.Default, "", GameWindowFlags.Default, DisplayDevice.Default, 2, 0, flags)
{ } { }
#endregion #endregion
@ -111,9 +111,7 @@ namespace Examples.Tutorial
SimpleES20Window example; SimpleES20Window example;
try try
{ {
example = new SimpleES20Window(GraphicsContextFlags.Default); example = new SimpleES20Window(GraphicsContextFlags.Embedded);
//example = new SimpleES20Window(GraphicsContextFlags.Embedded);
} }
catch catch
{ {

3
Source/Examples/OpenTK/Test/GameWindowStates.cs
View file

@ -29,8 +29,7 @@ namespace Examples.Tests
KeyboardState keyboard, keyboard_old; KeyboardState keyboard, keyboard_old;
public GameWindowStates() public GameWindowStates()
: base(800, 600, GraphicsMode.Default, "Test", GameWindowFlags.Default, : base(800, 600, GraphicsMode.Default)
DisplayDevice.GetDisplay(DisplayIndex.Second), 1, 0, GraphicsContextFlags.Embedded)
{ {
VSync = VSyncMode.On; VSync = VSyncMode.On;
Keyboard.KeyRepeat = true; Keyboard.KeyRepeat = true;

2
Source/OpenTK/Platform/Egl/EglGraphicsMode.cs
View file

@ -67,7 +67,7 @@ namespace OpenTK.Platform.Egl
Egl.DEPTH_SIZE, depth > 0 ? depth : 0, Egl.DEPTH_SIZE, depth > 0 ? depth : 0,
Egl.STENCIL_SIZE, stencil > 0 ? stencil : 0, Egl.STENCIL_SIZE, stencil > 0 ? stencil : 0,
//Egl.SAMPLE_BUFFERS, samples > 0 ? 1 : 0, Egl.SAMPLE_BUFFERS, samples > 0 ? 1 : 0,
Egl.SAMPLES, samples > 0 ? samples : 0, Egl.SAMPLES, samples > 0 ? samples : 0,
Egl.NONE, Egl.NONE,