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

Synced with newest version of the binding generator: use IntPtr instead of System.IntPtr; update license text.

Browse source 
Reverted breaking change to Gl3Dfx* enums (the gl4 branch turned those into Gl3dfx).
This commit is contained in:
the_fiddler 2010-12-06 14:33:33 +00:00
parent 5b40433350
commit c000fd4bb4
4 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Source/OpenTK/Graphics/OpenGL/GL.cs
View file

@ -1,8 +1,7 @@
#region License
//
// The Open Toolkit Library License
//
// Copyright (c) 2006 - 2009 the Open Toolkit library.
// Copyright (c) 2006 - 2010 the Open Toolkit library.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@ -23,7 +22,8 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
//
#endregion
namespace OpenTK.Graphics.OpenGL
{
@ -16883,7 +16883,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_vertex_buffer_object", Version = "1.2", EntryPoint = "glMapBufferARB")]
public static
unsafe System.IntPtr MapBuffer(OpenTK.Graphics.OpenGL.BufferTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexBufferObject access)
unsafe IntPtr MapBuffer(OpenTK.Graphics.OpenGL.BufferTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexBufferObject access)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -29047,7 +29047,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ATI_map_object_buffer", Version = "1.2", EntryPoint = "glMapObjectBufferATI")]
public static
unsafe System.IntPtr MapObjectBuffer(Int32 buffer)
unsafe IntPtr MapObjectBuffer(Int32 buffer)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -29063,7 +29063,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ATI_map_object_buffer", Version = "1.2", EntryPoint = "glMapObjectBufferATI")]
public static
unsafe System.IntPtr MapObjectBuffer(UInt32 buffer)
unsafe IntPtr MapObjectBuffer(UInt32 buffer)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -64377,7 +64377,7 @@ namespace OpenTK.Graphics.OpenGL
/// </param>
[AutoGenerated(Category = "VERSION_1_0", Version = "1.0", EntryPoint = "glGetString")]
public static
System.String GetString(OpenTK.Graphics.OpenGL.StringName name)
String GetString(OpenTK.Graphics.OpenGL.StringName name)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -64405,7 +64405,7 @@ namespace OpenTK.Graphics.OpenGL
/// </param>
[AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetStringi")]
public static
System.String GetString(OpenTK.Graphics.OpenGL.StringName name, Int32 index)
String GetString(OpenTK.Graphics.OpenGL.StringName name, Int32 index)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -64434,7 +64434,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_3_0", Version = "3.0", EntryPoint = "glGetStringi")]
public static
System.String GetString(OpenTK.Graphics.OpenGL.StringName name, UInt32 index)
String GetString(OpenTK.Graphics.OpenGL.StringName name, UInt32 index)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -72119,7 +72119,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glMapBuffer")]
public static
unsafe System.IntPtr MapBuffer(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferAccess access)
unsafe IntPtr MapBuffer(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferAccess access)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -72158,7 +72158,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_map_buffer_range", Version = "3.0", EntryPoint = "glMapBufferRange")]
public static
unsafe System.IntPtr MapBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access)
unsafe IntPtr MapBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -132500,7 +132500,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "EXT_direct_state_access", Version = "", EntryPoint = "glMapNamedBufferEXT")]
public static
unsafe System.IntPtr MapNamedBuffer(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess access)
unsafe IntPtr MapNamedBuffer(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess access)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -132516,7 +132516,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "EXT_direct_state_access", Version = "", EntryPoint = "glMapNamedBufferEXT")]
public static
unsafe System.IntPtr MapNamedBuffer(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess access)
unsafe IntPtr MapNamedBuffer(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess access)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -132532,7 +132532,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "EXT_direct_state_access", Version = "", EntryPoint = "glMapNamedBufferRangeEXT")]
public static
unsafe System.IntPtr MapNamedBufferRange(Int32 buffer, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access)
unsafe IntPtr MapNamedBufferRange(Int32 buffer, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -132548,7 +132548,7 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "EXT_direct_state_access", Version = "", EntryPoint = "glMapNamedBufferRangeEXT")]
public static
unsafe System.IntPtr MapNamedBufferRange(UInt32 buffer, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access)
unsafe IntPtr MapNamedBufferRange(UInt32 buffer, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))

22
Source/OpenTK/Graphics/OpenGL/GLCore.cs
View file

@ -1,8 +1,7 @@
#region License
//
// The Open Toolkit Library License
//
// Copyright (c) 2006 - 2009 the Open Toolkit library.
// Copyright (c) 2006 - 2010 the Open Toolkit library.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@ -23,7 +22,8 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
//
#endregion
namespace OpenTK.Graphics.OpenGL
{
@ -2390,10 +2390,10 @@ namespace OpenTK.Graphics.OpenGL
internal extern static unsafe void GetSharpenTexFuncSGIS(OpenTK.Graphics.OpenGL.TextureTarget target, [OutAttribute] Single* points);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetString", ExactSpelling = true)]
internal extern static System.IntPtr GetString(OpenTK.Graphics.OpenGL.StringName name);
internal extern static IntPtr GetString(OpenTK.Graphics.OpenGL.StringName name);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetStringi", ExactSpelling = true)]
internal extern static System.IntPtr GetStringi(OpenTK.Graphics.OpenGL.StringName name, UInt32 index);
internal extern static IntPtr GetStringi(OpenTK.Graphics.OpenGL.StringName name, UInt32 index);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetSubroutineIndex", ExactSpelling = true)]
internal extern static Int32 GetSubroutineIndex(UInt32 program, OpenTK.Graphics.OpenGL.ShaderType shadertype, String name);
@ -2987,13 +2987,13 @@ namespace OpenTK.Graphics.OpenGL
internal extern static unsafe void Map2f(OpenTK.Graphics.OpenGL.MapTarget target, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single* points);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapBuffer", ExactSpelling = true)]
internal extern static unsafe System.IntPtr MapBuffer(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferAccess access);
internal extern static unsafe IntPtr MapBuffer(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferAccess access);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapBufferARB", ExactSpelling = true)]
internal extern static unsafe System.IntPtr MapBufferARB(OpenTK.Graphics.OpenGL.BufferTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexBufferObject access);
internal extern static unsafe IntPtr MapBufferARB(OpenTK.Graphics.OpenGL.BufferTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexBufferObject access);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapBufferRange", ExactSpelling = true)]
internal extern static unsafe System.IntPtr MapBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access);
internal extern static unsafe IntPtr MapBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapControlPointsNV", ExactSpelling = true)]
internal extern static void MapControlPointsNV(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, IntPtr points);
@ -3011,13 +3011,13 @@ namespace OpenTK.Graphics.OpenGL
internal extern static void MapGrid2f(Int32 un, Single u1, Single u2, Int32 vn, Single v1, Single v2);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapNamedBufferEXT", ExactSpelling = true)]
internal extern static unsafe System.IntPtr MapNamedBufferEXT(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess access);
internal extern static unsafe IntPtr MapNamedBufferEXT(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess access);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapNamedBufferRangeEXT", ExactSpelling = true)]
internal extern static unsafe System.IntPtr MapNamedBufferRangeEXT(UInt32 buffer, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access);
internal extern static unsafe IntPtr MapNamedBufferRangeEXT(UInt32 buffer, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapObjectBufferATI", ExactSpelling = true)]
internal extern static unsafe System.IntPtr MapObjectBufferATI(UInt32 buffer);
internal extern static unsafe IntPtr MapObjectBufferATI(UInt32 buffer);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapParameterfvNV", ExactSpelling = true)]
internal extern static unsafe void MapParameterfvNV(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, Single* @params);

22
Source/OpenTK/Graphics/OpenGL/GLDelegates.cs
View file

@ -1,8 +1,7 @@
#region License
//
// The Open Toolkit Library License
//
// Copyright (c) 2006 - 2009 the Open Toolkit library.
// Copyright (c) 2006 - 2010 the Open Toolkit library.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@ -23,7 +22,8 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
//
#endregion
namespace OpenTK.Graphics.OpenGL
{
@ -2388,10 +2388,10 @@ namespace OpenTK.Graphics.OpenGL
internal unsafe delegate void GetSharpenTexFuncSGIS(OpenTK.Graphics.OpenGL.TextureTarget target, [OutAttribute] Single* points);
internal unsafe static GetSharpenTexFuncSGIS glGetSharpenTexFuncSGIS;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate System.IntPtr GetString(OpenTK.Graphics.OpenGL.StringName name);
internal delegate IntPtr GetString(OpenTK.Graphics.OpenGL.StringName name);
internal static GetString glGetString;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate System.IntPtr GetStringi(OpenTK.Graphics.OpenGL.StringName name, UInt32 index);
internal delegate IntPtr GetStringi(OpenTK.Graphics.OpenGL.StringName name, UInt32 index);
internal static GetStringi glGetStringi;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate Int32 GetSubroutineIndex(UInt32 program, OpenTK.Graphics.OpenGL.ShaderType shadertype, String name);
@ -2985,13 +2985,13 @@ namespace OpenTK.Graphics.OpenGL
internal unsafe delegate void Map2f(OpenTK.Graphics.OpenGL.MapTarget target, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single* points);
internal unsafe static Map2f glMap2f;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate System.IntPtr MapBuffer(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferAccess access);
internal unsafe delegate IntPtr MapBuffer(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferAccess access);
internal unsafe static MapBuffer glMapBuffer;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate System.IntPtr MapBufferARB(OpenTK.Graphics.OpenGL.BufferTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexBufferObject access);
internal unsafe delegate IntPtr MapBufferARB(OpenTK.Graphics.OpenGL.BufferTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexBufferObject access);
internal unsafe static MapBufferARB glMapBufferARB;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate System.IntPtr MapBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access);
internal unsafe delegate IntPtr MapBufferRange(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access);
internal unsafe static MapBufferRange glMapBufferRange;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void MapControlPointsNV(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, IntPtr points);
@ -3009,13 +3009,13 @@ namespace OpenTK.Graphics.OpenGL
internal delegate void MapGrid2f(Int32 un, Single u1, Single u2, Int32 vn, Single v1, Single v2);
internal static MapGrid2f glMapGrid2f;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate System.IntPtr MapNamedBufferEXT(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess access);
internal unsafe delegate IntPtr MapNamedBufferEXT(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess access);
internal unsafe static MapNamedBufferEXT glMapNamedBufferEXT;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate System.IntPtr MapNamedBufferRangeEXT(UInt32 buffer, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access);
internal unsafe delegate IntPtr MapNamedBufferRangeEXT(UInt32 buffer, IntPtr offset, IntPtr length, OpenTK.Graphics.OpenGL.BufferAccessMask access);
internal unsafe static MapNamedBufferRangeEXT glMapNamedBufferRangeEXT;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate System.IntPtr MapObjectBufferATI(UInt32 buffer);
internal unsafe delegate IntPtr MapObjectBufferATI(UInt32 buffer);
internal unsafe static MapObjectBufferATI glMapObjectBufferATI;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate void MapParameterfvNV(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, Single* @params);

12
Source/OpenTK/Graphics/OpenGL/GLEnums.cs
View file

@ -1,8 +1,7 @@
#region License
//
// The Open Toolkit Library License
//
// Copyright (c) 2006 - 2009 the Open Toolkit library.
// Copyright (c) 2006 - 2010 the Open Toolkit library.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@ -23,7 +22,8 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
//
#endregion
using System;
@ -9217,7 +9217,7 @@ namespace OpenTK.Graphics.OpenGL
TextureFixedSampleLocations = ((int)0x9107),
}
public enum Gl3dfxMultisample : int
public enum Gl3DfxMultisample : int
{
MultisampleBit3Dfx = ((int)0x20000000),
Multisample3Dfx = ((int)0x86B2),
@ -9225,11 +9225,11 @@ namespace OpenTK.Graphics.OpenGL
Samples3Dfx = ((int)0x86B4),
}
public enum Gl3dfxTbuffer : int
public enum Gl3DfxTbuffer : int
{
}
public enum Gl3dfxTextureCompressionFxt1 : int
public enum Gl3DfxTextureCompressionFxt1 : int
{
CompressedRgbFxt13Dfx = ((int)0x86B0),
CompressedRgbaFxt13Dfx = ((int)0x86B1),