thefiddler · renanyoy · Jul 18, 2014 · Jul 18, 2014 · Jul 18, 2014 · Jul 18, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,10 @@ language: objective-c
 
 env:
  global:
-  - EnableNuGetPackageRestore=true 
+  - EnableNuGetPackageRestore=true
  matrix:
   - MONO_VER="2.10.11"
-  - MONO_VER="3.2.6"
+  - MONO_VER="3.6.0"
 
 before_install:
  - wget "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.dmg" || true
@@ -15,4 +15,3 @@ before_install:
 
 script:
  - xbuild && xbuild /p:Configuration=Release
-
diff --git a/Documentation/Todo.txt b/Documentation/Todo.txt
@@ -7,6 +7,11 @@
 - Implement touch input API.
 - Implement force feedback API.
 - Add Portable Class Library (PCL) target.
+- Add OpenCL support.
+- Add OpenGL ES 3.1 support.
+- Port to Linux/Wayland.
+- Port to Blackberry (WIP at https://github.com/rcmaniac25/opentk).
+- Port to Tizen.
 
 [Hard]
 - Merge with mono/opentk.
diff --git a/OpenTK.sln b/OpenTK.sln
@@ -74,6 +74,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Rewrite", "Source
 		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.API.Desktop", "Source\Tests\Test.API.Desktop\Test.API.Desktop.csproj", "{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -158,6 +163,14 @@ Global
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Nsis|Any CPU.Build.0 = Release|Any CPU
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+		{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}.Nsis|Any CPU.ActiveCfg = Release|Any CPU
+		{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}.Nsis|Any CPU.Build.0 = Release|Any CPU
+		{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4DDD20F-CB4E-43F4-A75C-4A3D668E1F99}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/README.md b/README.md
@@ -1,7 +1,9 @@
 OpenTK
 ======
 
-The Open Toolkit is an advanced, low-level C# library that wraps OpenGL, OpenGL ES and OpenAL. It is suitable for games, scientific applications and any other project that requires 3d graphics, audio or compute functionality.
+The Open Toolkit library is a fast, low-level C# binding for OpenGL, OpenGL ES and OpenAL. It runs on all major platforms and powers hundreds of apps, games and scientific research.
+
+Use OpenTK to add cross-platform 3d graphics, audio, compute and haptics to your C# application. Integrate it into your existing user interface or use it standalone without any external dependencies.
 
 Project website: http://www.opentk.com/
 
@@ -12,7 +14,7 @@ Features
 ========
 
 - Create cutting-edge graphics with OpenGL 4.4 and OpenGL ES 3.0
-- Spice up your GUI with 3d graphics
+- Spice up your GUI with 3d acceleration
 - Improve your code flow with strong types and inline documentation
 - Write once run everywhere
 
@@ -24,79 +26,66 @@ OpenTK is available for Windows, Linux, Mac OS X, *BSD, SteamOS, Android and iOS
 Instructions
 ============
 
-The simplest way to use OpenTK in your project is to install the [NuGet package](http://www.nuget.org/packages/OpenTK/).
+The simplest way to use OpenTK in your project is to install the [NuGet package](http://www.nuget.org/packages/OpenTK/). 
+
+Note what installing NuGet package will add reference to OpenTK.dll, but OpenTK.dll.config 
+will not be copied to the project output directory automatically, so you need to add it to your project 
+and then enable the "Copy to Output Directory" option (as in step 3 below).
 
 Alternatively, download the [OpenTK binaries](http://www.opentk.com) and:
 
 1. Copy OpenTK.dll and OpenTK.dll.config to your project directory
 2. Use "Add reference" to add OpenTK.dll as a project reference
 3. Use "Add files" to add OpenTK.dll.config to your project, and enable the "Copy to Output Directory" option.
 
-If you wish to build OpenTK from source, simply double-click OpenTK.sln
+To build OpenTK from source, simply double-click OpenTK.sln and build through your IDE.
+
+Alternatively, open a command prompt and type:
+```
+git clone https://github.com/opentk/opentk   # Download source code from git
+cd opentk                                    # Enter the source directory
+msbuild /p:Configuration=Release OpenTK.sln  # Build on .Net (Windows)
+xbuild  /p:Configuration=Release OpenTK.sln  # Build on Mono (Linux / Mac OS X)
+```
 
 
 News
 ====
 
-OpenTK 1.1.2 was released on 19 May 2014.
+OpenTK 1.1.4c was released on 24 July 2014.
 
-It contains performance and stability improvements and synchronizes the OpenGL and OpenGL ES bindings with the May 2014 Khronos specifications.
+This is a hotfix release that improves stability on Mac OS X. Moreover, it synchronizes the GamePad configuration database with SDL 2.0.4 and fixes an invalid GUID introduced in 1.1.4b.
+
+OpenTK 1.1.4 was released on 21 July 2014.
+
+This release resolves a number of identified issues, adds experimental support for Linux/KMS and synchronizes the OpenGL and OpenGL ES bindings with the July 2014 Khronos specifications.
 
 **Changelog:**
 
-1. New Cocoa backend for Mac OS X, with support for OpenGL 4.x and retina displays. Huge thanks to [Ollhax](https://github.com/Ollhax) for implementing the backend from scratch, including the necessary Cocoa bindings!
-2. Custom hardware cursors are now supported: `INativeWindow.Cursor = new MouseCursor(...)`
-3. Up to 2000% improvement in binding loading speed. The exact numbers depend on the operating system and hardware configuration. On a Nvidia 650M GPU and a 2.3GHz processor:
-   - Linux: 6.5ms instead of  45ms
-   - MacOS: 9.5ms instead of 165ms
-   - Win64: 5.9ms instead of 108ms
-4. Up to 1000% improvement in memory consumption. The object graph has been reduced from 9000 to 900 objects, consuming between 185-220KB of memory depending on the platform and hardware configuration.
-5. Support for high-resolution X/Y scrolling on all platforms:
-   - `OpenTK.Input.MouseState.Scroll.X/Y`
-6. Improved mouse input APIs:
-   - new INativeWindow.MouseMove, MouseUp, MouseDown and MouseWheel events
-   - new OpenTK.Mouse.GetCursorPos() API to retrieve the state of the system cursor
-   - all mouse event arguments now carry the current MouseState
-7. Improved keyboard input APIs:
-   - support for non-US layouts on Linux/X11
-   - all keyboard event arguments now carry the current KeyboardState
-   - all keyboard event arguments now report the correct KeyModifiers state
-8. New OpenGL extensions:
-   - AMD_gcn_shader
-   - AMD_gpu_shader_int64
-   - AMD_transform_feedback4
-   - EXT_shader_image_load_formatted
-   - NV_shader_thread_group
-   - NV_shader_thread_shuffle
-9. New OpenGL ES extensions:
-   - ARM_shader_framebuffer_fetch
-   - ARM_shader_framebuffer_fetch_depth_stencil
-   - EXT_shader_pixel_local_storage
-   - KHR_blend_equation_advanced
-   - OES_sample_shading
-   - OES_sample_variables
-   - OES_shader_image_atomic
-   - OES_shader_multisample_interpolation
-   - OES_texture_stencil8
-   - OES_texture_storage_multisample_2d_array
-10. Improved OpenGL ES documentation tooltips.
-11. Improved stability when using EGL on Linux and Windows/ANGLE.
-12. Improved stability when using SDL2 on 32bit platforms.
-13. Improved the shutdown sequence on X11.
-14. Fixed a marshaling issue affecting 2d and 3d arrays on Windows/.Net.
-
-
-OpenTK 1.1.2 is backwards compatible with 1.1.1. Users of previous versions are encouraged to upgrade.
+1. Fixed a memory leak in OpenGL functions accepting a string array.
+2. Fixed an issue where `MakeCurrent()` might fail on Linux/X11 when using the Nvidia closed-source drivers.
+3. Fixed an issue where `GameWindow` might remain open on Linux/X11 after calling `Close()` or `Dispose()`.
+4. Fixed a potential crash on Mac OS X systems without hardware acceleration (e.g. virtual machines).
+5. Fixed function parameters for the `OES_byte_coordinates` extension.
+6. Fixed an issue where OpenTK would always perform a full rebuild even when a partial rebuild could work.
+7. Fixed all compilation warnings on VS2013 and Mono 3.4.0.
+8. Improved OpenGL and OpenGL ES documentation on 'count' parameters.
+9. New platform: Linux/KMS. You can now run OpenTK applications on a Linux terminal without an X11 display server.
+10. New OpenGL ES extensions:
+  - ANDROID_extension_pack_es31a
+
+OpenTK 1.1.4 is backwards compatible with 1.1.3. Users of previous versions are **strongly** encouraged to upgrade.
 
 
 Known issues
 ============
 
-The SDL2 backend has a number of limitations compared to the native platform backends. In particular, SDL2 does not support:
-   - `OpenTK.GLControl`. OpenTK will automatically use a native platform backend instead.
+1. The SDL2 backend has a number of limitations compared to the native platform backends. In particular, SDL2 does not support:
+   - `OpenTK.GLControl`. OpenTK will automatically switch to a native platform backend instead.
    - `DisplayDevice.ChangeResolution()` without a fullscreen `INativeWindow`.
-   - changing `INativeWindow.WindowBorder` once a window is created.
-   - high-resolution mouse input. Additionally, it is limited to a single keyboard and mouse device.
+   - Switching between `WindowBorder.Fixed` and `WindowBorder.Resizable`.
+   - High-resolution mouse input. Additionally, it is limited to a single keyboard and mouse device.
+2. OpenTK.Input.GamePad.SetVibration is currently not implemented. This API will be implemented in a future release.
 
 
 Contributing
@@ -113,17 +102,16 @@ Some areas we could really use your help:
 - Tutorials for OpenGL 3.x and 4.x. [Inspiration here](https://github.com/Groovounet/ogl-samples)
 - New platforms:
   - Native Client (NaCL)
-  - Raspberry PI (EGL without X11)
+  - Blackberry
   - Wayland
   - Mir
   - WinRT (via ANGLE)
 - New features:
   - Multitouch
-  - Clipboard
-  - Input Method Editors (IMEs)
-  - USB HID joystick backend (Windows, Linux)
+  - Force feedback
+  - Improved joystick support (HID backend for Windows, Linux)
 
-Further ideas for improvement are always welcome.
+Further ideas for improvement are always welcome!
 
 
 Requirements
@@ -164,6 +152,10 @@ http://www.opentk.com/project/license
 API compatibility
 =================
 
+OpenTK 1.1.4 is backwards compatible with 1.1.3.
+
+OpenTK 1.1.3 is backwards compatible with 1.1.2.
+
 OpenTK 1.1.2 is backwards compatible with 1.1.1.
 
 OpenTK 1.1.1 is backwards compatible with 1.1.0.
@@ -250,3 +242,10 @@ Change namespace:
 - GL.DisableDriverControlQCOM -> GL.Qcom.DisableDriverControl
 - GL.GetDriverControlsQCOM -> GL.Qcom.GetDriverControls
 - GL.GetDriverControlStringQCOM -> GL.Qcom.GetDriverControlString
+
+
+See also
+========
+
+[Delta Engine](http://deltaengine.net/), a high-level, open-source game engine.
+[MonoGame](https://github.com/mono/monogame), an open-source, cross-platform implementation of XNA.
diff --git a/Source/Bind/CSharpSpecWriter.cs b/Source/Bind/CSharpSpecWriter.cs
@@ -384,7 +384,7 @@ void WriteDocumentation(BindStreamWriter sw, Function f)
                     else
                     {
                         Console.Error.WriteLine(
-                            "[Warning] Parameter '{0}' in function '{1}' not found in documentation '{{{3}}}'",
+                            "[Warning] Parameter '{0}' in function '{1}' not found in documentation '{{{2}}}'",
                             param.Name, f.Name,
                             String.Join(",", docs.Parameters.Select(p => p.Name).ToArray()));
                         sw.WriteLine("/// <param name=\"{0}\">{1}</param>",
@@ -505,6 +505,10 @@ void WriteEnums(BindStreamWriter sw, EnumCollection enums, FunctionCollection wr
                         sw.WriteLine("/// </summary>");
                     }
 
+                    if (@enum.IsObsolete)
+                        sw.WriteLine("[Obsolete(\"{0}\")]", @enum.Obsolete);
+                    if (!@enum.CLSCompliant)
+                        sw.WriteLine("[CLSCompliant(false)]");
                     if (@enum.IsFlagCollection)
                         sw.WriteLine("[Flags]");
                     sw.WriteLine("public enum " + @enum.Name + " : " + @enum.Type);

diff --git a/Source/Bind/ES/ES2Generator.cs b/Source/Bind/ES/ES2Generator.cs
@@ -25,6 +25,8 @@ public ES2Generator(Settings settings, string dirName)
             Settings.DefaultDocPath = Path.Combine(
                 Settings.DefaultDocPath, "ES20");
 
+            Settings.OverridesFiles.Add("GL2/overrides.xml");
+
             Profile = "gles2";
             Version = "2.0";
 

diff --git a/Source/Bind/ES/ES31Generator.cs b/Source/Bind/ES/ES31Generator.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.XPath;
+using Bind.GL2;
+using Bind.Structures;
+using Delegate=Bind.Structures.Delegate;
+using Enum=Bind.Structures.Enum;
+
+namespace Bind.ES
+{
+    // Generation implementation for OpenGL ES 3.1
+    class ES31Generator : Generator
+    {
+        public ES31Generator(Settings settings, string dirName)
+            : base(settings, dirName)
+        {
+            Settings.DefaultOutputPath = Path.Combine(
+                Settings.DefaultOutputPath, "../ES31");
+            Settings.DefaultOutputNamespace = "OpenTK.Graphics.ES31";
+            Settings.DefaultImportsFile = "ES31.Core.cs";
+            Settings.DefaultDelegatesFile = "ES31.Delegates.cs";
+            Settings.DefaultEnumsFile = "ES31.Enums.cs";
+            Settings.DefaultWrappersFile = "ES31.cs";
+            Settings.DefaultDocPath = Path.Combine(
+                Settings.DefaultDocPath, "ES31");
+
+            Settings.OverridesFiles.Add("GL2/overrides.xml");
+            Settings.OverridesFiles.Add("GL2/ES/3.1");
+
+            Profile = "gles2";
+            Version = "2.0|3.0|3.1";
+
+            // For compatibility with OpenTK 1.0 and Xamarin, generate
+            // overloads using the "All" enum in addition to strongly-typed enums.
+            // This can be disabled by passing "-o:-keep_untyped_enums" as a cmdline parameter.
+            Settings.DefaultCompatibility |= Settings.Legacy.KeepUntypedEnums;
+            //Settings.DefaultCompatibility |= Settings.Legacy.UseDllImports;
+        }
+    }
+}
diff --git a/Source/Bind/ES/ES3Generator.cs b/Source/Bind/ES/ES3Generator.cs
@@ -25,6 +25,8 @@ public ES3Generator(Settings settings, string dirName)
             Settings.DefaultDocPath = Path.Combine(
                 Settings.DefaultDocPath, "ES30");
 
+            Settings.OverridesFiles.Add("GL2/overrides.xml");
+
             Profile = "gles2"; // The 3.0 spec reuses the gles2 apiname
             Version = "2.0|3.0";
 

diff --git a/Source/Bind/ES/ESGenerator.cs b/Source/Bind/ES/ESGenerator.cs
@@ -25,6 +25,9 @@ public ESGenerator(Settings settings, string dirName)
             Settings.DefaultDocPath = Path.Combine(
                 Settings.DefaultDocPath, "ES20"); // no ES11 docbook sources available
 
+            Settings.OverridesFiles.Add("GL2/overrides.xml");
+            Settings.OverridesFiles.Add("GL2/ES/1.1/");
+
             // Khronos releases a combined 1.0+1.1 specification,
             // so we cannot distinguish between the two.
             // Todo: add support for common and light profiles.