From c594440302d5b8fa8c3eb0f22414f4d79f03cf61 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Wed, 31 Oct 2007 17:44:14 +0000 Subject: [PATCH] Regenerated using the latest Bind version. Adds PixelInternalFormat enum. Fixes IntPtr parameters getting object overloads (when they shouldn't) --- Source/OpenTK/OpenGL/Bindings/GL.cs | 210 +++---------------- Source/OpenTK/OpenGL/Bindings/GLCore.cs | 6 +- Source/OpenTK/OpenGL/Bindings/GLDelegates.cs | 6 +- Source/OpenTK/OpenGL/Bindings/GLEnums.cs | 154 +++++++------- 4 files changed, 113 insertions(+), 263 deletions(-) diff --git a/Source/OpenTK/OpenGL/Bindings/GL.cs b/Source/OpenTK/OpenGL/Bindings/GL.cs index 43dfafbe..3336e865 100644 --- a/Source/OpenTK/OpenGL/Bindings/GL.cs +++ b/Source/OpenTK/OpenGL/Bindings/GL.cs @@ -3265,18 +3265,18 @@ namespace OpenTK.OpenGL } public static - void TexImage1D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels) + void TexImage1D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels) { - Delegates.glTexImage1D((GL.Enums.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels); + Delegates.glTexImage1D((GL.Enums.TextureTarget)target, (Int32)level, (GL.Enums.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels); } public static - void TexImage1D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, [In, Out] object pixels) + void TexImage1D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, [In, Out] object pixels) { System.Runtime.InteropServices.GCHandle pixels_ptr = System.Runtime.InteropServices.GCHandle.Alloc(pixels, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glTexImage1D((GL.Enums.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject()); + Delegates.glTexImage1D((GL.Enums.TextureTarget)target, (Int32)level, (GL.Enums.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject()); } finally { @@ -3285,18 +3285,18 @@ namespace OpenTK.OpenGL } public static - void TexImage2D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels) + void TexImage2D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels) { - Delegates.glTexImage2D((GL.Enums.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels); + Delegates.glTexImage2D((GL.Enums.TextureTarget)target, (Int32)level, (GL.Enums.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels); } public static - void TexImage2D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, [In, Out] object pixels) + void TexImage2D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, [In, Out] object pixels) { System.Runtime.InteropServices.GCHandle pixels_ptr = System.Runtime.InteropServices.GCHandle.Alloc(pixels, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glTexImage2D((GL.Enums.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject()); + Delegates.glTexImage2D((GL.Enums.TextureTarget)target, (Int32)level, (GL.Enums.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject()); } finally { @@ -6795,18 +6795,18 @@ namespace OpenTK.OpenGL } public static - void TexImage3D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels) + void TexImage3D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels) { - Delegates.glTexImage3D((GL.Enums.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels); + Delegates.glTexImage3D((GL.Enums.TextureTarget)target, (Int32)level, (GL.Enums.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels); } public static - void TexImage3D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, [In, Out] object pixels) + void TexImage3D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, [In, Out] object pixels) { System.Runtime.InteropServices.GCHandle pixels_ptr = System.Runtime.InteropServices.GCHandle.Alloc(pixels, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glTexImage3D((GL.Enums.TextureTarget)target, (Int32)level, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject()); + Delegates.glTexImage3D((GL.Enums.TextureTarget)target, (Int32)level, (GL.Enums.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (GL.Enums.PixelFormat)format, (GL.Enums.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject()); } finally { @@ -9048,17 +9048,15 @@ namespace OpenTK.OpenGL } public static - void BufferData(GL.Enums.VERSION_1_5 target, [In, Out] object size, [In, Out] object data, GL.Enums.VERSION_1_5 usage) + void BufferData(GL.Enums.VERSION_1_5 target, IntPtr size, [In, Out] object data, GL.Enums.VERSION_1_5 usage) { - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glBufferData((GL.Enums.VERSION_1_5)target, (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject(), (GL.Enums.VERSION_1_5)usage); + Delegates.glBufferData((GL.Enums.VERSION_1_5)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (GL.Enums.VERSION_1_5)usage); } finally { - size_ptr.Free(); data_ptr.Free(); } } @@ -9070,35 +9068,15 @@ namespace OpenTK.OpenGL } public static - void BufferSubData(GL.Enums.VERSION_1_5 target, IntPtr offset, [In, Out] object size, [In, Out] object data) + void BufferSubData(GL.Enums.VERSION_1_5 target, IntPtr offset, IntPtr size, [In, Out] object data) { - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glBufferSubData((GL.Enums.VERSION_1_5)target, (IntPtr)offset, (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject()); + Delegates.glBufferSubData((GL.Enums.VERSION_1_5)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { - size_ptr.Free(); - data_ptr.Free(); - } - } - - public static - void BufferSubData(GL.Enums.VERSION_1_5 target, [In, Out] object offset, [In, Out] object size, [In, Out] object data) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glBufferSubData((GL.Enums.VERSION_1_5)target, (IntPtr)offset_ptr.AddrOfPinnedObject(), (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - size_ptr.Free(); data_ptr.Free(); } } @@ -9110,35 +9088,15 @@ namespace OpenTK.OpenGL } public static - void GetBufferSubData(GL.Enums.VERSION_1_5 target, IntPtr offset, [In, Out] object size, [In, Out] object data) + void GetBufferSubData(GL.Enums.VERSION_1_5 target, IntPtr offset, IntPtr size, [In, Out] object data) { - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glGetBufferSubData((GL.Enums.VERSION_1_5)target, (IntPtr)offset, (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject()); + Delegates.glGetBufferSubData((GL.Enums.VERSION_1_5)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { - size_ptr.Free(); - data_ptr.Free(); - } - } - - public static - void GetBufferSubData(GL.Enums.VERSION_1_5 target, [In, Out] object offset, [In, Out] object size, [In, Out] object data) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glGetBufferSubData((GL.Enums.VERSION_1_5)target, (IntPtr)offset_ptr.AddrOfPinnedObject(), (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - size_ptr.Free(); data_ptr.Free(); } } @@ -16950,17 +16908,15 @@ namespace OpenTK.OpenGL } public static - void BufferData(GL.Enums.ARB_vertex_buffer_object target, [In, Out] object size, [In, Out] object data, GL.Enums.ARB_vertex_buffer_object usage) + void BufferData(GL.Enums.ARB_vertex_buffer_object target, IntPtr size, [In, Out] object data, GL.Enums.ARB_vertex_buffer_object usage) { - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glBufferDataARB((GL.Enums.ARB_vertex_buffer_object)target, (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject(), (GL.Enums.ARB_vertex_buffer_object)usage); + Delegates.glBufferDataARB((GL.Enums.ARB_vertex_buffer_object)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (GL.Enums.ARB_vertex_buffer_object)usage); } finally { - size_ptr.Free(); data_ptr.Free(); } } @@ -16972,35 +16928,15 @@ namespace OpenTK.OpenGL } public static - void BufferSubData(GL.Enums.ARB_vertex_buffer_object target, IntPtr offset, [In, Out] object size, [In, Out] object data) + void BufferSubData(GL.Enums.ARB_vertex_buffer_object target, IntPtr offset, IntPtr size, [In, Out] object data) { - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glBufferSubDataARB((GL.Enums.ARB_vertex_buffer_object)target, (IntPtr)offset, (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject()); + Delegates.glBufferSubDataARB((GL.Enums.ARB_vertex_buffer_object)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { - size_ptr.Free(); - data_ptr.Free(); - } - } - - public static - void BufferSubData(GL.Enums.ARB_vertex_buffer_object target, [In, Out] object offset, [In, Out] object size, [In, Out] object data) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glBufferSubDataARB((GL.Enums.ARB_vertex_buffer_object)target, (IntPtr)offset_ptr.AddrOfPinnedObject(), (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - size_ptr.Free(); data_ptr.Free(); } } @@ -17012,35 +16948,15 @@ namespace OpenTK.OpenGL } public static - void GetBufferSubData(GL.Enums.ARB_vertex_buffer_object target, IntPtr offset, [In, Out] object size, [In, Out] object data) + void GetBufferSubData(GL.Enums.ARB_vertex_buffer_object target, IntPtr offset, IntPtr size, [In, Out] object data) { - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); try { - Delegates.glGetBufferSubDataARB((GL.Enums.ARB_vertex_buffer_object)target, (IntPtr)offset, (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject()); + Delegates.glGetBufferSubDataARB((GL.Enums.ARB_vertex_buffer_object)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject()); } finally { - size_ptr.Free(); - data_ptr.Free(); - } - } - - public static - void GetBufferSubData(GL.Enums.ARB_vertex_buffer_object target, [In, Out] object offset, [In, Out] object size, [In, Out] object data) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle data_ptr = System.Runtime.InteropServices.GCHandle.Alloc(data, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glGetBufferSubDataARB((GL.Enums.ARB_vertex_buffer_object)target, (IntPtr)offset_ptr.AddrOfPinnedObject(), (IntPtr)size_ptr.AddrOfPinnedObject(), (IntPtr)data_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - size_ptr.Free(); data_ptr.Free(); } } @@ -35935,39 +35851,6 @@ namespace OpenTK.OpenGL Delegates.glBindBufferRangeNV((GL.Enums.NV_transform_feedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); } - [System.CLSCompliant(false)] - public static - void BindBufferRange(GL.Enums.NV_transform_feedback target, UInt32 index, UInt32 buffer, [In, Out] object offset, [In, Out] object size) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glBindBufferRangeNV((GL.Enums.NV_transform_feedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset_ptr.AddrOfPinnedObject(), (IntPtr)size_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - size_ptr.Free(); - } - } - - public static - void BindBufferRange(GL.Enums.NV_transform_feedback target, Int32 index, Int32 buffer, [In, Out] object offset, [In, Out] object size) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glBindBufferRangeNV((GL.Enums.NV_transform_feedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset_ptr.AddrOfPinnedObject(), (IntPtr)size_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - size_ptr.Free(); - } - } - [System.CLSCompliant(false)] public static void BindBufferOffset(GL.Enums.NV_transform_feedback target, UInt32 index, UInt32 buffer, IntPtr offset) @@ -35981,35 +35864,6 @@ namespace OpenTK.OpenGL Delegates.glBindBufferOffsetNV((GL.Enums.NV_transform_feedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset); } - [System.CLSCompliant(false)] - public static - void BindBufferOffset(GL.Enums.NV_transform_feedback target, UInt32 index, UInt32 buffer, [In, Out] object offset) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glBindBufferOffsetNV((GL.Enums.NV_transform_feedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - } - } - - public static - void BindBufferOffset(GL.Enums.NV_transform_feedback target, Int32 index, Int32 buffer, [In, Out] object offset) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glBindBufferOffsetNV((GL.Enums.NV_transform_feedback)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - } - } - [System.CLSCompliant(false)] public static void BindBufferBase(GL.Enums.NV_transform_feedback target, UInt32 index, UInt32 buffer) @@ -39421,22 +39275,6 @@ namespace OpenTK.OpenGL Delegates.glFlushMappedBufferRangeAPPLE((GL.Enums.APPLE_flush_buffer_range)target, (IntPtr)offset, (IntPtr)size); } - public static - void FlushMappedBufferRange(GL.Enums.APPLE_flush_buffer_range target, [In, Out] object offset, [In, Out] object size) - { - System.Runtime.InteropServices.GCHandle offset_ptr = System.Runtime.InteropServices.GCHandle.Alloc(offset, System.Runtime.InteropServices.GCHandleType.Pinned); - System.Runtime.InteropServices.GCHandle size_ptr = System.Runtime.InteropServices.GCHandle.Alloc(size, System.Runtime.InteropServices.GCHandleType.Pinned); - try - { - Delegates.glFlushMappedBufferRangeAPPLE((GL.Enums.APPLE_flush_buffer_range)target, (IntPtr)offset_ptr.AddrOfPinnedObject(), (IntPtr)size_ptr.AddrOfPinnedObject()); - } - finally - { - offset_ptr.Free(); - size_ptr.Free(); - } - } - } public static partial class GREMEDY diff --git a/Source/OpenTK/OpenGL/Bindings/GLCore.cs b/Source/OpenTK/OpenGL/Bindings/GLCore.cs index b7f61d6d..2961ed41 100644 --- a/Source/OpenTK/OpenGL/Bindings/GLCore.cs +++ b/Source/OpenTK/OpenGL/Bindings/GLCore.cs @@ -557,10 +557,10 @@ namespace OpenTK.OpenGL internal extern static unsafe void TexParameteriv(GL.Enums.TextureTarget target, GL.Enums.TextureParameterName pname, Int32* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage1D", ExactSpelling = true)] - internal extern static void TexImage1D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); + internal extern static void TexImage1D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage2D", ExactSpelling = true)] - internal extern static void TexImage2D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); + internal extern static void TexImage2D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexEnvf", ExactSpelling = true)] internal extern static void TexEnvf(GL.Enums.TextureEnvTarget target, GL.Enums.TextureEnvParameter pname, Single param); @@ -1124,7 +1124,7 @@ namespace OpenTK.OpenGL internal extern static void ResetMinmax(GL.Enums.VERSION_1_2 target); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage3D", ExactSpelling = true)] - internal extern static void TexImage3D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); + internal extern static void TexImage3D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexSubImage3D", ExactSpelling = true)] internal extern static void TexSubImage3D(GL.Enums.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); diff --git a/Source/OpenTK/OpenGL/Bindings/GLDelegates.cs b/Source/OpenTK/OpenGL/Bindings/GLDelegates.cs index 17a91a6a..75e958a1 100644 --- a/Source/OpenTK/OpenGL/Bindings/GLDelegates.cs +++ b/Source/OpenTK/OpenGL/Bindings/GLDelegates.cs @@ -555,10 +555,10 @@ namespace OpenTK.OpenGL internal unsafe delegate void TexParameteriv(GL.Enums.TextureTarget target, GL.Enums.TextureParameterName pname, Int32* @params); internal unsafe static TexParameteriv glTexParameteriv; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexImage1D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); + internal delegate void TexImage1D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); internal static TexImage1D glTexImage1D; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexImage2D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); + internal delegate void TexImage2D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); internal static TexImage2D glTexImage2D; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void TexEnvf(GL.Enums.TextureEnvTarget target, GL.Enums.TextureEnvParameter pname, Single param); @@ -1122,7 +1122,7 @@ namespace OpenTK.OpenGL internal delegate void ResetMinmax(GL.Enums.VERSION_1_2 target); internal static ResetMinmax glResetMinmax; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexImage3D(GL.Enums.TextureTarget target, Int32 level, Int32 internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); + internal delegate void TexImage3D(GL.Enums.TextureTarget target, Int32 level, GL.Enums.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); internal static TexImage3D glTexImage3D; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void TexSubImage3D(GL.Enums.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr pixels); diff --git a/Source/OpenTK/OpenGL/Bindings/GLEnums.cs b/Source/OpenTK/OpenGL/Bindings/GLEnums.cs index c74b40f7..9cd39dc6 100644 --- a/Source/OpenTK/OpenGL/Bindings/GLEnums.cs +++ b/Source/OpenTK/OpenGL/Bindings/GLEnums.cs @@ -1569,75 +1569,84 @@ namespace OpenTK.OpenGL public enum PixelInternalFormat { - RGB_ICC_SGIX = ((int)SGIX_icc_texture.RGB_ICC_SGIX), - RGBA4 = ((int)0x8056), - QUAD_LUMINANCE8_SGIS = ((int)SGIS_texture_select.QUAD_LUMINANCE8_SGIS), - DUAL_ALPHA8_SGIS = ((int)SGIS_texture_select.DUAL_ALPHA8_SGIS), - INTENSITY = ((int)0x8049), - DUAL_ALPHA4_SGIS = ((int)SGIS_texture_select.DUAL_ALPHA4_SGIS), - RGB5 = ((int)0x8050), - QUAD_ALPHA4_SGIS = ((int)SGIS_texture_select.QUAD_ALPHA4_SGIS), - DEPTH_COMPONENT32_SGIX = ((int)SGIX_depth_texture.DEPTH_COMPONENT32_SGIX), - DEPTH_COMPONENT16_SGIX = ((int)SGIX_depth_texture.DEPTH_COMPONENT16_SGIX), - ALPHA8 = ((int)0x803C), - INTENSITY12 = ((int)0x804C), - DUAL_LUMINANCE4_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE4_SGIS), - INTENSITY16 = ((int)0x804D), - DUAL_INTENSITY12_SGIS = ((int)SGIS_texture_select.DUAL_INTENSITY12_SGIS), - RGB10_A2 = ((int)0x8059), - ALPHA16_ICC_SGIX = ((int)SGIX_icc_texture.ALPHA16_ICC_SGIX), - LUMINANCE16_ICC_SGIX = ((int)SGIX_icc_texture.LUMINANCE16_ICC_SGIX), - DUAL_LUMINANCE8_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE8_SGIS), - DUAL_ALPHA12_SGIS = ((int)SGIS_texture_select.DUAL_ALPHA12_SGIS), - R3_G3_B2 = ((int)0x2A10), - DEPTH_COMPONENT24_SGIX = ((int)SGIX_depth_texture.DEPTH_COMPONENT24_SGIX), - RGB2_EXT = ((int)EXT_texture.RGB2_EXT), - QUAD_INTENSITY4_SGIS = ((int)SGIS_texture_select.QUAD_INTENSITY4_SGIS), - QUAD_INTENSITY8_SGIS = ((int)SGIS_texture_select.QUAD_INTENSITY8_SGIS), - QUAD_LUMINANCE4_SGIS = ((int)SGIS_texture_select.QUAD_LUMINANCE4_SGIS), - RGB8 = ((int)0x8051), - DUAL_LUMINANCE_ALPHA8_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE_ALPHA8_SGIS), - DUAL_LUMINANCE_ALPHA4_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE_ALPHA4_SGIS), - LUMINANCE16_ALPHA16 = ((int)0x8048), - R5_G6_B5_ICC_SGIX = ((int)SGIX_icc_texture.R5_G6_B5_ICC_SGIX), - LUMINANCE12_ALPHA4 = ((int)0x8046), - LUMINANCE6_ALPHA2 = ((int)0x8044), - INTENSITY4 = ((int)0x804A), - RGB10 = ((int)0x8052), - RGB12 = ((int)0x8053), - DUAL_INTENSITY8_SGIS = ((int)SGIS_texture_select.DUAL_INTENSITY8_SGIS), - RGB4 = ((int)0x804F), - LUMINANCE4_ALPHA4 = ((int)0x8043), - R5_G6_B5_A8_ICC_SGIX = ((int)SGIX_icc_texture.R5_G6_B5_A8_ICC_SGIX), - INTENSITY8 = ((int)0x804B), - LUMINANCE4 = ((int)0x803F), - RGB16 = ((int)0x8054), - DUAL_ALPHA16_SGIS = ((int)SGIS_texture_select.DUAL_ALPHA16_SGIS), - ALPHA_ICC_SGIX = ((int)SGIX_icc_texture.ALPHA_ICC_SGIX), - QUAD_ALPHA8_SGIS = ((int)SGIS_texture_select.QUAD_ALPHA8_SGIS), + RGBA = ((int)PixelFormat.RGBA), DUAL_LUMINANCE12_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE12_SGIS), - LUMINANCE16 = ((int)0x8042), - RGBA16 = ((int)0x805B), - ALPHA12 = ((int)0x803D), - LUMINANCE12 = ((int)0x8041), - LUMINANCE8_ALPHA8 = ((int)0x8045), - ALPHA16 = ((int)0x803E), - LUMINANCE16_ALPHA8_ICC_SGIX = ((int)SGIX_icc_texture.LUMINANCE16_ALPHA8_ICC_SGIX), - LUMINANCE_ALPHA_ICC_SGIX = ((int)SGIX_icc_texture.LUMINANCE_ALPHA_ICC_SGIX), - RGBA8 = ((int)0x8058), - INTENSITY_ICC_SGIX = ((int)SGIX_icc_texture.INTENSITY_ICC_SGIX), - RGBA12 = ((int)0x805A), - INTENSITY16_ICC_SGIX = ((int)SGIX_icc_texture.INTENSITY16_ICC_SGIX), - LUMINANCE8 = ((int)0x8040), - DUAL_LUMINANCE16_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE16_SGIS), - ALPHA4 = ((int)0x803B), - LUMINANCE12_ALPHA12 = ((int)0x8047), - LUMINANCE_ICC_SGIX = ((int)SGIX_icc_texture.LUMINANCE_ICC_SGIX), - DUAL_INTENSITY16_SGIS = ((int)SGIS_texture_select.DUAL_INTENSITY16_SGIS), + RGBA_ICC_SGIX = ((int)SGIX_icc_texture.RGBA_ICC_SGIX), + ALPHA_ICC_SGIX = ((int)SGIX_icc_texture.ALPHA_ICC_SGIX), + DUAL_INTENSITY12_SGIS = ((int)SGIS_texture_select.DUAL_INTENSITY12_SGIS), + RGB_ICC_SGIX = ((int)SGIX_icc_texture.RGB_ICC_SGIX), + QUAD_LUMINANCE8_SGIS = ((int)SGIS_texture_select.QUAD_LUMINANCE8_SGIS), RGB5_A1 = ((int)0x8057), + LUMINANCE4 = ((int)0x803F), + LUMINANCE12_ALPHA4 = ((int)0x8046), + FOUR = ((int)4), + LUMINANCE8_ALPHA8 = ((int)0x8045), + LUMINANCE16 = ((int)0x8042), + LUMINANCE12 = ((int)0x8041), + R5_G6_B5_A8_ICC_SGIX = ((int)SGIX_icc_texture.R5_G6_B5_A8_ICC_SGIX), + LUMINANCE6_ALPHA2 = ((int)0x8044), + RGB5 = ((int)0x8050), + LUMINANCE_ALPHA = ((int)PixelFormat.LUMINANCE_ALPHA), + QUAD_ALPHA4_SGIS = ((int)SGIS_texture_select.QUAD_ALPHA4_SGIS), + THREE = ((int)3), + DEPTH_COMPONENT16_SGIX = ((int)SGIX_depth_texture.DEPTH_COMPONENT16_SGIX), + RGB8 = ((int)0x8051), + QUAD_ALPHA8_SGIS = ((int)SGIS_texture_select.QUAD_ALPHA8_SGIS), + ALPHA = ((int)PixelFormat.ALPHA), + DUAL_LUMINANCE_ALPHA4_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE_ALPHA4_SGIS), + RGBA16 = ((int)0x805B), + DUAL_LUMINANCE16_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE16_SGIS), + DUAL_ALPHA8_SGIS = ((int)SGIS_texture_select.DUAL_ALPHA8_SGIS), + LUMINANCE16_ICC_SGIX = ((int)SGIX_icc_texture.LUMINANCE16_ICC_SGIX), + R3_G3_B2 = ((int)0x2A10), + R5_G6_B5_ICC_SGIX = ((int)SGIX_icc_texture.R5_G6_B5_ICC_SGIX), + DUAL_ALPHA16_SGIS = ((int)SGIS_texture_select.DUAL_ALPHA16_SGIS), + LUMINANCE16_ALPHA8_ICC_SGIX = ((int)SGIX_icc_texture.LUMINANCE16_ALPHA8_ICC_SGIX), + DUAL_INTENSITY8_SGIS = ((int)SGIS_texture_select.DUAL_INTENSITY8_SGIS), + RGB = ((int)PixelFormat.RGB), + ALPHA12 = ((int)0x803D), + RGB4 = ((int)0x804F), + ALPHA16 = ((int)0x803E), + RGBA12 = ((int)0x805A), + LUMINANCE_ICC_SGIX = ((int)SGIX_icc_texture.LUMINANCE_ICC_SGIX), + QUAD_INTENSITY4_SGIS = ((int)SGIS_texture_select.QUAD_INTENSITY4_SGIS), + RGBA8 = ((int)0x8058), + RGB2_EXT = ((int)EXT_texture.RGB2_EXT), RGBA2 = ((int)0x8055), DUAL_INTENSITY4_SGIS = ((int)SGIS_texture_select.DUAL_INTENSITY4_SGIS), - RGBA_ICC_SGIX = ((int)SGIX_icc_texture.RGBA_ICC_SGIX), + RGBA4 = ((int)0x8056), + ALPHA16_ICC_SGIX = ((int)SGIX_icc_texture.ALPHA16_ICC_SGIX), + DUAL_ALPHA4_SGIS = ((int)SGIS_texture_select.DUAL_ALPHA4_SGIS), + INTENSITY16_ICC_SGIX = ((int)SGIX_icc_texture.INTENSITY16_ICC_SGIX), + LUMINANCE16_ALPHA16 = ((int)0x8048), + LUMINANCE_ALPHA_ICC_SGIX = ((int)SGIX_icc_texture.LUMINANCE_ALPHA_ICC_SGIX), + DEPTH_COMPONENT32_SGIX = ((int)SGIX_depth_texture.DEPTH_COMPONENT32_SGIX), + LUMINANCE12_ALPHA12 = ((int)0x8047), + ALPHA4 = ((int)0x803B), + INTENSITY = ((int)0x8049), + QUAD_LUMINANCE4_SGIS = ((int)SGIS_texture_select.QUAD_LUMINANCE4_SGIS), + LUMINANCE8 = ((int)0x8040), + TWO = ((int)2), + INTENSITY_ICC_SGIX = ((int)SGIX_icc_texture.INTENSITY_ICC_SGIX), + INTENSITY8 = ((int)0x804B), + DUAL_ALPHA12_SGIS = ((int)SGIS_texture_select.DUAL_ALPHA12_SGIS), + RGB10_A2 = ((int)0x8059), + INTENSITY12 = ((int)0x804C), + DUAL_INTENSITY16_SGIS = ((int)SGIS_texture_select.DUAL_INTENSITY16_SGIS), + INTENSITY16 = ((int)0x804D), + ONE = ((int)1), + INTENSITY4 = ((int)0x804A), + DUAL_LUMINANCE8_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE8_SGIS), + RGB12 = ((int)0x8053), + LUMINANCE = ((int)PixelFormat.LUMINANCE), + RGB10 = ((int)0x8052), + RGB16 = ((int)0x8054), + DUAL_LUMINANCE4_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE4_SGIS), + ALPHA8 = ((int)0x803C), + DEPTH_COMPONENT24_SGIX = ((int)SGIX_depth_texture.DEPTH_COMPONENT24_SGIX), + LUMINANCE4_ALPHA4 = ((int)0x8043), + DUAL_LUMINANCE_ALPHA8_SGIS = ((int)SGIS_texture_select.DUAL_LUMINANCE_ALPHA8_SGIS), + QUAD_INTENSITY8_SGIS = ((int)SGIS_texture_select.QUAD_INTENSITY8_SGIS), } public enum InterleavedArrayFormat @@ -2610,6 +2619,7 @@ namespace OpenTK.OpenGL ONE_MINUS_SRC_COLOR = ((int)0x0301), NORMAL_ARRAY = ((int)0x8075), IDENTITY_NV = ((int)0x862A), + MODELVIEW9_ARB = ((int)0x8729), LUMINANCE12_ALPHA4 = ((int)0x8046), PIXEL_TILE_CACHE_SIZE_SGIX = ((int)0x8145), MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV = ((int)0x8C8A), @@ -2768,7 +2778,6 @@ namespace OpenTK.OpenGL OUTPUT_TEXTURE_COORD15_EXT = ((int)0x87AC), COLOR_MATRIX_SGI = ((int)0x80B1), MATRIX1_ARB = ((int)0x88C1), - OP_NEGATE_EXT = ((int)0x8783), EVAL_VERTEX_ATTRIB4_NV = ((int)0x86CA), LIGHT4 = ((int)0x4004), MAP1_TANGENT_EXT = ((int)0x8444), @@ -2788,6 +2797,7 @@ namespace OpenTK.OpenGL COMPRESSED_SRGB = ((int)0x8C48), RGB5_A1 = ((int)0x8057), SOURCE1_RGB_EXT = ((int)0x8581), + COLOR_ARRAY_LIST_STRIDE_IBM = ((int)103082), FLOAT_MAT4x3 = ((int)0x8B6A), TEXTURE25_ARB = ((int)0x84D9), EYE_PLANE_ABSOLUTE_NV = ((int)0x855C), @@ -3171,6 +3181,7 @@ namespace OpenTK.OpenGL ALIASED_POINT_SIZE_RANGE = ((int)0x846D), DRAW_BUFFER2_ATI = ((int)0x8827), COMBINER0_NV = ((int)0x8550), + FOUR = ((int)4), UNSIGNED_SHORT_8_8_APPLE = ((int)0x85BA), PRIMITIVE_ID_NV = ((int)0x8C7C), TEXTURE_CLIPMAP_DEPTH_SGIX = ((int)0x8176), @@ -3249,7 +3260,7 @@ namespace OpenTK.OpenGL PIXEL_MAP_R_TO_R = ((int)0x0C76), TEXTURE_LUMINANCE_TYPE_ARB = ((int)0x8C14), OBJECT_SUBTYPE_ARB = ((int)0x8B4F), - DRAW_BUFFER10_ATI = ((int)0x882F), + OP_NEGATE_EXT = ((int)0x8783), TEXTURE_CUBE_MAP_NEGATIVE_X_EXT = ((int)0x8516), SAMPLE_BUFFERS_EXT = ((int)0x80A8), PROGRAM_UNDER_NATIVE_LIMITS_ARB = ((int)0x88B6), @@ -3312,6 +3323,7 @@ namespace OpenTK.OpenGL ELEMENT_ARRAY_BUFFER_BINDING_ARB = ((int)0x8895), FRAGMENT_LIGHT5_SGIX = ((int)0x8411), MODULATE_SUBTRACT_ATI = ((int)0x8746), + TWO = ((int)2), DEPTH32F_STENCIL8_NV = ((int)0x8DAC), TEXTURE_WRAP_R_EXT = ((int)0x8072), OUTPUT_TEXTURE_COORD27_EXT = ((int)0x87B8), @@ -3487,7 +3499,8 @@ namespace OpenTK.OpenGL FULL_STIPPLE_HINT_PGI = ((int)0x1A219), MATRIX5_ARB = ((int)0x88C5), GREATER = ((int)0x0204), - COLOR_ARRAY_LIST_STRIDE_IBM = ((int)103082), + OFFSET_HILO_TEXTURE_RECTANGLE_NV = ((int)0x8855), + DRAW_BUFFER10_ATI = ((int)0x882F), RETURN = ((int)0x0102), NUM_COMPRESSED_TEXTURE_FORMATS_ARB = ((int)0x86A2), TEXTURE13_ARB = ((int)0x84CD), @@ -4751,7 +4764,7 @@ namespace OpenTK.OpenGL TEXTURE_BINDING_CUBE_MAP_EXT = ((int)0x8514), MAX_TEXTURE_LOD_BIAS = ((int)0x84FD), EVAL_BIT = ((int)0x00010000), - MODELVIEW9_ARB = ((int)0x8729), + THREE = ((int)3), MAX_PROGRAM_NATIVE_ATTRIBS_ARB = ((int)0x88AF), CONSTANT = ((int)0x8576), REG_7_ATI = ((int)0x8928), @@ -4945,7 +4958,7 @@ namespace OpenTK.OpenGL MAP1_VERTEX_4 = ((int)0x0D98), INCR_WRAP_EXT = ((int)0x8507), POST_COLOR_MATRIX_BLUE_SCALE = ((int)0x80B6), - OFFSET_HILO_TEXTURE_RECTANGLE_NV = ((int)0x8855), + ALPHA16_EXT = ((int)0x803E), LUMINANCE_ALPHA32UI_EXT = ((int)0x8D75), MAX_CONVOLUTION_HEIGHT = ((int)0x801B), FRAGMENT_LIGHT7_SGIX = ((int)0x8413), @@ -5414,7 +5427,6 @@ namespace OpenTK.OpenGL MODELVIEW19_ARB = ((int)0x8733), TEXTURE_COMPARE_FAIL_VALUE_ARB = ((int)0x80BF), ALIASED_LINE_WIDTH_RANGE = ((int)0x846E), - ALPHA16_EXT = ((int)0x803E), QUAD_LUMINANCE4_SGIS = ((int)0x8120), OUTPUT_TEXTURE_COORD29_EXT = ((int)0x87BA), GENERATE_MIPMAP_HINT = ((int)0x8192),