From bf89d0a6abbefba9335aa4440d03f62253345cad Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Fri, 23 Oct 2009 15:36:02 +0000 Subject: [PATCH] Fixed GetVertexPointerParameter signature to comply with the specs. --- .../Bind/Specifications/GL2/gloverrides.xml | 2 +- Source/OpenTK/Graphics/OpenGL/GL.cs | 40 +++++++++---------- Source/OpenTK/Graphics/OpenGL/GLCore.cs | 2 +- Source/OpenTK/Graphics/OpenGL/GLDelegates.cs | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Source/Bind/Specifications/GL2/gloverrides.xml b/Source/Bind/Specifications/GL2/gloverrides.xml index bf908b27..decc78d1 100644 --- a/Source/Bind/Specifications/GL2/gloverrides.xml +++ b/Source/Bind/Specifications/GL2/gloverrides.xml @@ -142,7 +142,7 @@ - VertexAttribPointerType + VertexAttribPointerParameter diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs index 24ba11b0..8f67dba5 100644 --- a/Source/OpenTK/Graphics/OpenGL/GL.cs +++ b/Source/OpenTK/Graphics/OpenGL/GL.cs @@ -53089,7 +53089,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [InAttribute, OutAttribute] ref T2 pointer) + void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer) where T2 : struct { #if DEBUG @@ -53099,7 +53099,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); pointer = (T2)pointer_ptr.Target; } finally @@ -53132,7 +53132,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[,,] pointer) + void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer) where T2 : struct { #if DEBUG @@ -53142,7 +53142,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -53174,7 +53174,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[,] pointer) + void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,] pointer) where T2 : struct { #if DEBUG @@ -53184,7 +53184,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -53216,7 +53216,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[] pointer) + void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer) where T2 : struct { #if DEBUG @@ -53226,7 +53226,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -53258,13 +53258,13 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [OutAttribute] IntPtr pointer) + void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer); #if DEBUG } #endif @@ -53292,7 +53292,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [InAttribute, OutAttribute] ref T2 pointer) + void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer) where T2 : struct { #if DEBUG @@ -53302,7 +53302,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); pointer = (T2)pointer_ptr.Target; } finally @@ -53336,7 +53336,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[,,] pointer) + void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer) where T2 : struct { #if DEBUG @@ -53346,7 +53346,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -53379,7 +53379,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[,] pointer) + void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,] pointer) where T2 : struct { #if DEBUG @@ -53389,7 +53389,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -53422,7 +53422,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [InAttribute, OutAttribute] T2[] pointer) + void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer) where T2 : struct { #if DEBUG @@ -53432,7 +53432,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -53465,13 +53465,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")] public static - void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [OutAttribute] IntPtr pointer) + void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)pname, (IntPtr)pointer); + Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs index ec9a1393..0908d0bf 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs @@ -2290,7 +2290,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static unsafe void GetVertexAttribivNV(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetVertexAttribPointerv", ExactSpelling = true)] - internal extern static void GetVertexAttribPointerv(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [OutAttribute] IntPtr pointer); + internal extern static void GetVertexAttribPointerv(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetVertexAttribPointervARB", ExactSpelling = true)] internal extern static void GetVertexAttribPointervARB(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [OutAttribute] IntPtr pointer); diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs index b5af672c..ac149bdc 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs @@ -2288,7 +2288,7 @@ namespace OpenTK.Graphics.OpenGL internal unsafe delegate void GetVertexAttribivNV(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params); internal unsafe static GetVertexAttribivNV glGetVertexAttribivNV; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void GetVertexAttribPointerv(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerType pname, [OutAttribute] IntPtr pointer); + internal delegate void GetVertexAttribPointerv(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer); internal static GetVertexAttribPointerv glGetVertexAttribPointerv; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void GetVertexAttribPointervARB(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [OutAttribute] IntPtr pointer);