ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-08-04 11:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
parallels 2013-11-09 17:15:05 +01:00
parent 2725b3cd08 da684d233e
commit 7f921dae47
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Examples/OpenGL/1.x/Picking.cs
View file

@ -235,7 +235,7 @@ namespace Examples.Tutorial
protected override void OnRenderFrame(FrameEventArgs e) protected override void OnRenderFrame(FrameEventArgs e)
{ {
GL.Color3(Color.White); GL.Color3(Color.White);
GL.Enable(EnableCap.ColorArray); GL.EnableClientState(EnableCap.ColorArray);
#region Pass 1: Draw Object and pick Triangle #region Pass 1: Draw Object and pick Triangle
GL.ClearColor(1f, 1f, 1f, 1f); // clears to uint.MaxValue GL.ClearColor(1f, 1f, 1f, 1f); // clears to uint.MaxValue
@ -261,7 +261,7 @@ namespace Examples.Tutorial
#endregion Pass 1: Draw Object and pick Triangle #endregion Pass 1: Draw Object and pick Triangle
GL.Color3(Color.White); GL.Color3(Color.White);
GL.Disable(EnableCap.ColorArray); GL.DisableClientState(EnableCap.ColorArray);
#region Pass 2: Draw Shape #region Pass 2: Draw Shape
if (SelectedTriangle == uint.MaxValue) if (SelectedTriangle == uint.MaxValue)

7
Source/OpenTK/Platform/SDL2/Sdl2.cs
View file

@ -49,9 +49,16 @@ namespace OpenTK.Platform.SDL2
public readonly static Version Version; public readonly static Version Version;
static SDL() static SDL()
{
try
{ {
GetVersion(out Version); GetVersion(out Version);
} }
catch
{
// nom nom
}
}
#region Functions #region Functions