From 7da0ca28ca28d4e06dad2865bf51b7df8d4e9cd0 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sat, 28 Mar 2009 15:40:51 +0000 Subject: [PATCH] Updated tokens for ARB_half_float_vertex (issue [#589]). --- Source/Bind/Specifications/GL2/enumext.spec | 22 +++++- Source/Bind/Specifications/GL2/gl.spec | 8 +-- Source/OpenTK/Graphics/GL/GL.cs | 80 ++++++++++----------- Source/OpenTK/Graphics/GL/GLDelegates.cs | 8 +-- Source/OpenTK/Graphics/GL/GLEnums.cs | 7 +- 5 files changed, 74 insertions(+), 51 deletions(-) diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index 8fe9b13d..4271846b 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -689,7 +689,7 @@ passthru: /* Reuse tokens from ARB_framebuffer_object */ passthru: /* Reuse tokens from ARB_framebuffer_sRGB */ # use ARB_framebuffer_sRGB FRAMEBUFFER_SRGB passthru: /* Reuse tokens from ARB_half_float_vertex */ - use ARB_half_float_vertex HALF_FLOAT +# use ARB_half_float_vertex HALF_FLOAT passthru: /* Reuse tokens from ARB_map_buffer_range */ use ARB_map_buffer_range MAP_READ_BIT use ARB_map_buffer_range MAP_WRITE_BIT @@ -6384,7 +6384,6 @@ GetTextureParameter enum: use ARB_framebuffer_object TEXTURE_INTENSITY_TYPE use ARB_framebuffer_object TEXTURE_DEPTH_TYPE - # Promoted from ARB_depth_buffer_float PixelType enum: use ARB_depth_buffer_float FLOAT_32_UNSIGNED_INT_24_8_REV @@ -6396,5 +6395,24 @@ EnableCap enum: GetPName enum: use ARB_framebuffer_sRGB FRAMEBUFFER_SRGB +# Promoted from ARB_half_float_vertex +VertexAttribPointerType enum: + use ARB_half_float_vertex HALF_FLOAT + +VertexPointerType enum: + use ARB_half_float_vertex HALF_FLOAT + +NormalPointerType enum: + use ARB_half_float_vertex HALF_FLOAT + +ColorPointerType enum: + use ARB_half_float_vertex HALF_FLOAT + +FogPointerType enum: + use ARB_half_float_vertex HALF_FLOAT + +TexCoordPointerType enum: + use ARB_half_float_vertex HALF_FLOAT + # End (don't remove, or the last token may be missed!) diff --git a/Source/Bind/Specifications/GL2/gl.spec b/Source/Bind/Specifications/GL2/gl.spec index d159c24c..8f357351 100644 --- a/Source/Bind/Specifications/GL2/gl.spec +++ b/Source/Bind/Specifications/GL2/gl.spec @@ -14768,7 +14768,7 @@ FogCoorddvEXT(coord) FogCoordPointerEXT(type, stride, pointer) return void - param type FogPointerTypeEXT in value + param type FogPointerType in value # FogPointerTypeEXT in value param stride SizeI in value param pointer Void in array [COMPSIZE(type/stride)] retained category EXT_fog_coord @@ -15007,7 +15007,7 @@ Binormal3svEXT(v) TangentPointerEXT(type, stride, pointer) return void - param type TangentPointerTypeEXT in value + param type NormalPointerType in value # TangentPointerTypeEXT in value param stride SizeI in value param pointer Void in array [COMPSIZE(type/stride)] retained category EXT_coordinate_frame @@ -15019,7 +15019,7 @@ TangentPointerEXT(type, stride, pointer) BinormalPointerEXT(type, stride, pointer) return void - param type BinormalPointerTypeEXT in value + param type NormalPointerType in value # BinormalPointerTypeEXT in value param stride SizeI in value param pointer Void in array [COMPSIZE(type/stride)] retained category EXT_coordinate_frame @@ -16644,7 +16644,7 @@ EdgeFlagPointerListIBM(stride, pointer, ptrstride) FogCoordPointerListIBM(type, stride, pointer, ptrstride) return void - param type FogPointerTypeIBM in value + param type FogPointerType in value # FogPointerTypeIBM in value param stride Int32 in value param pointer VoidPointer in array [COMPSIZE(type/stride)] retained param ptrstride Int32 in value diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs index bdb2638c..51a671e3 100644 --- a/Source/OpenTK/Graphics/GL/GL.cs +++ b/Source/OpenTK/Graphics/GL/GL.cs @@ -104352,13 +104352,13 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")] public static - void FogCoordPointer(OpenTK.Graphics.ExtFogCoord type, Int32 stride, IntPtr pointer) + void FogCoordPointer(OpenTK.Graphics.FogPointerType type, Int32 stride, IntPtr pointer) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glFogCoordPointerEXT((OpenTK.Graphics.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer); + Delegates.glFogCoordPointerEXT((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer); #if DEBUG } #endif @@ -104385,7 +104385,7 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")] public static - void FogCoordPointer(OpenTK.Graphics.ExtFogCoord type, Int32 stride, [In, Out] ref T2 pointer) + void FogCoordPointer(OpenTK.Graphics.FogPointerType type, Int32 stride, [In, Out] ref T2 pointer) where T2 : struct { #if DEBUG @@ -104395,7 +104395,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glFogCoordPointerEXT((OpenTK.Graphics.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glFogCoordPointerEXT((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -104427,7 +104427,7 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")] public static - void FogCoordPointer(OpenTK.Graphics.ExtFogCoord type, Int32 stride, [In, Out] T2[] pointer) + void FogCoordPointer(OpenTK.Graphics.FogPointerType type, Int32 stride, [In, Out] T2[] pointer) where T2 : struct { #if DEBUG @@ -104437,7 +104437,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glFogCoordPointerEXT((OpenTK.Graphics.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glFogCoordPointerEXT((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -104469,7 +104469,7 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")] public static - void FogCoordPointer(OpenTK.Graphics.ExtFogCoord type, Int32 stride, [In, Out] T2[,] pointer) + void FogCoordPointer(OpenTK.Graphics.FogPointerType type, Int32 stride, [In, Out] T2[,] pointer) where T2 : struct { #if DEBUG @@ -104479,7 +104479,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glFogCoordPointerEXT((OpenTK.Graphics.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glFogCoordPointerEXT((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -104511,7 +104511,7 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")] public static - void FogCoordPointer(OpenTK.Graphics.ExtFogCoord type, Int32 stride, [In, Out] T2[,,] pointer) + void FogCoordPointer(OpenTK.Graphics.FogPointerType type, Int32 stride, [In, Out] T2[,,] pointer) where T2 : struct { #if DEBUG @@ -104521,7 +104521,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glFogCoordPointerEXT((OpenTK.Graphics.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glFogCoordPointerEXT((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -105354,13 +105354,13 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")] public static - void TangentPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, IntPtr pointer) + void TangentPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, IntPtr pointer) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTangentPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer); + Delegates.glTangentPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer); #if DEBUG } #endif @@ -105368,7 +105368,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")] public static - void TangentPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, [In, Out] ref T2 pointer) + void TangentPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, [In, Out] ref T2 pointer) where T2 : struct { #if DEBUG @@ -105378,7 +105378,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glTangentPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glTangentPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -105391,7 +105391,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")] public static - void TangentPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, [In, Out] T2[] pointer) + void TangentPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, [In, Out] T2[] pointer) where T2 : struct { #if DEBUG @@ -105401,7 +105401,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glTangentPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glTangentPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -105414,7 +105414,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")] public static - void TangentPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, [In, Out] T2[,] pointer) + void TangentPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, [In, Out] T2[,] pointer) where T2 : struct { #if DEBUG @@ -105424,7 +105424,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glTangentPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glTangentPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -105437,7 +105437,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")] public static - void TangentPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, [In, Out] T2[,,] pointer) + void TangentPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, [In, Out] T2[,,] pointer) where T2 : struct { #if DEBUG @@ -105447,7 +105447,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glTangentPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glTangentPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -105460,13 +105460,13 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")] public static - void BinormalPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, IntPtr pointer) + void BinormalPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, IntPtr pointer) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glBinormalPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer); + Delegates.glBinormalPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer); #if DEBUG } #endif @@ -105474,7 +105474,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")] public static - void BinormalPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, [In, Out] ref T2 pointer) + void BinormalPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, [In, Out] ref T2 pointer) where T2 : struct { #if DEBUG @@ -105484,7 +105484,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glBinormalPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glBinormalPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -105497,7 +105497,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")] public static - void BinormalPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, [In, Out] T2[] pointer) + void BinormalPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, [In, Out] T2[] pointer) where T2 : struct { #if DEBUG @@ -105507,7 +105507,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glBinormalPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glBinormalPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -105520,7 +105520,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")] public static - void BinormalPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, [In, Out] T2[,] pointer) + void BinormalPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, [In, Out] T2[,] pointer) where T2 : struct { #if DEBUG @@ -105530,7 +105530,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glBinormalPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glBinormalPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -105543,7 +105543,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")] public static - void BinormalPointer(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, [In, Out] T2[,,] pointer) + void BinormalPointer(OpenTK.Graphics.NormalPointerType type, Int32 stride, [In, Out] T2[,,] pointer) where T2 : struct { #if DEBUG @@ -105553,7 +105553,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glBinormalPointerEXT((OpenTK.Graphics.ExtCoordinateFrame)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glBinormalPointerEXT((OpenTK.Graphics.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -138231,13 +138231,13 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")] public static - void FogCoordPointerList(OpenTK.Graphics.IbmVertexArrayLists type, Int32 stride, IntPtr pointer, Int32 ptrstride) + void FogCoordPointerList(OpenTK.Graphics.FogPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride); + Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride); #if DEBUG } #endif @@ -138245,7 +138245,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")] public static - void FogCoordPointerList(OpenTK.Graphics.IbmVertexArrayLists type, Int32 stride, [In, Out] ref T2 pointer, Int32 ptrstride) + void FogCoordPointerList(OpenTK.Graphics.FogPointerType type, Int32 stride, [In, Out] ref T2 pointer, Int32 ptrstride) where T2 : struct { #if DEBUG @@ -138255,7 +138255,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride); + Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride); } finally { @@ -138268,7 +138268,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")] public static - void FogCoordPointerList(OpenTK.Graphics.IbmVertexArrayLists type, Int32 stride, [In, Out] T2[] pointer, Int32 ptrstride) + void FogCoordPointerList(OpenTK.Graphics.FogPointerType type, Int32 stride, [In, Out] T2[] pointer, Int32 ptrstride) where T2 : struct { #if DEBUG @@ -138278,7 +138278,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride); + Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride); } finally { @@ -138291,7 +138291,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")] public static - void FogCoordPointerList(OpenTK.Graphics.IbmVertexArrayLists type, Int32 stride, [In, Out] T2[,] pointer, Int32 ptrstride) + void FogCoordPointerList(OpenTK.Graphics.FogPointerType type, Int32 stride, [In, Out] T2[,] pointer, Int32 ptrstride) where T2 : struct { #if DEBUG @@ -138301,7 +138301,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride); + Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride); } finally { @@ -138314,7 +138314,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")] public static - void FogCoordPointerList(OpenTK.Graphics.IbmVertexArrayLists type, Int32 stride, [In, Out] T2[,,] pointer, Int32 ptrstride) + void FogCoordPointerList(OpenTK.Graphics.FogPointerType type, Int32 stride, [In, Out] T2[,,] pointer, Int32 ptrstride) where T2 : struct { #if DEBUG @@ -138324,7 +138324,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride); + Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride); } finally { diff --git a/Source/OpenTK/Graphics/GL/GLDelegates.cs b/Source/OpenTK/Graphics/GL/GLDelegates.cs index 2c8a827f..86a41e4e 100644 --- a/Source/OpenTK/Graphics/GL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/GL/GLDelegates.cs @@ -3248,7 +3248,7 @@ namespace OpenTK.Graphics internal unsafe delegate void FogCoorddvEXT(Double* coord); internal unsafe static FogCoorddvEXT glFogCoorddvEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void FogCoordPointerEXT(OpenTK.Graphics.ExtFogCoord type, Int32 stride, IntPtr pointer); + internal delegate void FogCoordPointerEXT(OpenTK.Graphics.FogPointerType type, Int32 stride, IntPtr pointer); internal static FogCoordPointerEXT glFogCoordPointerEXT; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void Tangent3bEXT(SByte tx, SByte ty, SByte tz); @@ -3311,10 +3311,10 @@ namespace OpenTK.Graphics internal unsafe delegate void Binormal3svEXT(Int16* v); internal unsafe static Binormal3svEXT glBinormal3svEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TangentPointerEXT(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, IntPtr pointer); + internal delegate void TangentPointerEXT(OpenTK.Graphics.NormalPointerType type, Int32 stride, IntPtr pointer); internal static TangentPointerEXT glTangentPointerEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void BinormalPointerEXT(OpenTK.Graphics.ExtCoordinateFrame type, Int32 stride, IntPtr pointer); + internal delegate void BinormalPointerEXT(OpenTK.Graphics.NormalPointerType type, Int32 stride, IntPtr pointer); internal static BinormalPointerEXT glBinormalPointerEXT; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void FinishTextureSUNX(); @@ -3635,7 +3635,7 @@ namespace OpenTK.Graphics internal unsafe delegate void EdgeFlagPointerListIBM(Int32 stride, bool* pointer, Int32 ptrstride); internal unsafe static EdgeFlagPointerListIBM glEdgeFlagPointerListIBM; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void FogCoordPointerListIBM(OpenTK.Graphics.IbmVertexArrayLists type, Int32 stride, IntPtr pointer, Int32 ptrstride); + internal delegate void FogCoordPointerListIBM(OpenTK.Graphics.FogPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride); internal static FogCoordPointerListIBM glFogCoordPointerListIBM; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void IndexPointerListIBM(OpenTK.Graphics.IndexPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride); diff --git a/Source/OpenTK/Graphics/GL/GLEnums.cs b/Source/OpenTK/Graphics/GL/GLEnums.cs index dffd231e..410a6308 100644 --- a/Source/OpenTK/Graphics/GL/GLEnums.cs +++ b/Source/OpenTK/Graphics/GL/GLEnums.cs @@ -198,6 +198,7 @@ namespace OpenTK.Graphics UnsignedInt = ((int)0X1405), Float = ((int)0X1406), Double = ((int)0X140a), + HalfFloat = ((int)0X140b), } public enum ColorTableParameterPNameSgi @@ -1347,6 +1348,7 @@ namespace OpenTK.Graphics Int = ((int)0X1404), Float = ((int)0X1406), Double = ((int)0X140a), + HalfFloat = ((int)0X140b), } public enum PixelCopyType @@ -1644,6 +1646,7 @@ namespace OpenTK.Graphics Int = ((int)0X1404), Float = ((int)0X1406), Double = ((int)0X140a), + HalfFloat = ((int)0X140b), } public enum TextureCoordName @@ -2030,6 +2033,7 @@ namespace OpenTK.Graphics Int = ((int)0X1404), Float = ((int)0X1406), Double = ((int)0X140a), + HalfFloat = ((int)0X140b), } public enum ClipPlaneName @@ -6353,7 +6357,6 @@ namespace OpenTK.Graphics MapFlushExplicitBit = ((int)0X0010), MapUnsynchronizedBit = ((int)0X0020), MaxClipDistances = ((int)0X0D32), - HalfFloat = ((int)0X140b), ClipDistance0 = ((int)0X3000), ClipDistance1 = ((int)0X3001), ClipDistance2 = ((int)0X3002), @@ -9619,6 +9622,7 @@ namespace OpenTK.Graphics { Float = ((int)0X1406), Double = ((int)0X140a), + HalfFloat = ((int)0X140b), } public enum PointParameterName @@ -9751,6 +9755,7 @@ namespace OpenTK.Graphics UnsignedInt = ((int)0X1405), Float = ((int)0X1406), Double = ((int)0X140a), + HalfFloat = ((int)0X140b), } public enum ShaderParameter