From 316b5f265dac50b87340849be34e7ae2fa2b02b2 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sat, 5 Sep 2009 15:28:12 +0000 Subject: [PATCH] Regenerated bindings with using the cleaned up EXT_histogram, EXT_convolution and SGI_color_table tokens that were promoted in version 1.2. --- Source/OpenTK/Graphics/OpenGL/GL.cs | 100 +++++++++---------- Source/OpenTK/Graphics/OpenGL/GLCore.cs | 18 ++-- Source/OpenTK/Graphics/OpenGL/GLDelegates.cs | 18 ++-- Source/OpenTK/Graphics/OpenGL/GLEnums.cs | 85 ++++++++++++++++ 4 files changed, 153 insertions(+), 68 deletions(-) diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs index 2e750587..b021c35a 100644 --- a/Source/OpenTK/Graphics/OpenGL/GL.cs +++ b/Source/OpenTK/Graphics/OpenGL/GL.cs @@ -44207,7 +44207,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameterfv")] public static - void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] out Single @params) + void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] out Single @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -44217,7 +44217,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* @params_ptr = &@params) { - Delegates.glGetConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params_ptr); + Delegates.glGetConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Single*)@params_ptr); @params = *@params_ptr; } } @@ -44248,13 +44248,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameterfv")] public static - unsafe void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params) + unsafe void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Single* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params); + Delegates.glGetConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Single*)@params); #if DEBUG } #endif @@ -44281,7 +44281,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameterfv")] public static - void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single[] @params) + void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Single[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -44291,7 +44291,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* @params_ptr = @params) { - Delegates.glGetConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params_ptr); + Delegates.glGetConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Single*)@params_ptr); } } #if DEBUG @@ -44321,13 +44321,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameteriv")] public static - unsafe void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params) + unsafe void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Int32* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params); + Delegates.glGetConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Int32*)@params); #if DEBUG } #endif @@ -44354,7 +44354,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameteriv")] public static - void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32[] @params) + void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Int32[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -44364,7 +44364,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Int32* @params_ptr = @params) { - Delegates.glGetConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params_ptr); + Delegates.glGetConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Int32*)@params_ptr); } } #if DEBUG @@ -44393,7 +44393,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameteriv")] public static - void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] out Int32 @params) + void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] out Int32 @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -44403,7 +44403,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Int32* @params_ptr = &@params) { - Delegates.glGetConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params_ptr); + Delegates.glGetConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Int32*)@params_ptr); @params = *@params_ptr; } } @@ -44651,7 +44651,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")] public static - void GetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values) + void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values) where T4 : struct { #if DEBUG @@ -44661,7 +44661,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned); try { - Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject()); + Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject()); } finally { @@ -44703,7 +44703,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")] public static - void GetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values) + void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values) where T4 : struct { #if DEBUG @@ -44713,7 +44713,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned); try { - Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject()); + Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject()); } finally { @@ -44755,7 +44755,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")] public static - void GetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,] values) + void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,] values) where T4 : struct { #if DEBUG @@ -44765,7 +44765,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned); try { - Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject()); + Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject()); } finally { @@ -44807,7 +44807,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")] public static - void GetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values) + void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values) where T4 : struct { #if DEBUG @@ -44817,7 +44817,7 @@ namespace OpenTK.Graphics.OpenGL GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned); try { - Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject()); + Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject()); } finally { @@ -44859,13 +44859,13 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")] public static - void GetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values) + void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values); + Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values); #if DEBUG } #endif @@ -44892,7 +44892,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameterfv")] public static - void GetHistogramParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] out Single @params) + void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] out Single @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -44902,7 +44902,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* @params_ptr = &@params) { - Delegates.glGetHistogramParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params_ptr); + Delegates.glGetHistogramParameterfv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Single*)@params_ptr); @params = *@params_ptr; } } @@ -44933,13 +44933,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameterfv")] public static - unsafe void GetHistogramParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params) + unsafe void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Single* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetHistogramParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params); + Delegates.glGetHistogramParameterfv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Single*)@params); #if DEBUG } #endif @@ -44966,7 +44966,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameterfv")] public static - void GetHistogramParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single[] @params) + void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Single[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -44976,7 +44976,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* @params_ptr = @params) { - Delegates.glGetHistogramParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params_ptr); + Delegates.glGetHistogramParameterfv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Single*)@params_ptr); } } #if DEBUG @@ -45006,13 +45006,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameteriv")] public static - unsafe void GetHistogramParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params) + unsafe void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Int32* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetHistogramParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params); + Delegates.glGetHistogramParameteriv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Int32*)@params); #if DEBUG } #endif @@ -45039,7 +45039,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameteriv")] public static - void GetHistogramParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32[] @params) + void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Int32[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -45049,7 +45049,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Int32* @params_ptr = @params) { - Delegates.glGetHistogramParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params_ptr); + Delegates.glGetHistogramParameteriv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Int32*)@params_ptr); } } #if DEBUG @@ -45078,7 +45078,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameteriv")] public static - void GetHistogramParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] out Int32 @params) + void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] out Int32 @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -45088,7 +45088,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Int32* @params_ptr = &@params) { - Delegates.glGetHistogramParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params_ptr); + Delegates.glGetHistogramParameteriv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Int32*)@params_ptr); @params = *@params_ptr; } } @@ -46500,7 +46500,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameterfv")] public static - void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] out Single @params) + void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] out Single @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46510,7 +46510,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* @params_ptr = &@params) { - Delegates.glGetMinmaxParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params_ptr); + Delegates.glGetMinmaxParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Single*)@params_ptr); @params = *@params_ptr; } } @@ -46541,13 +46541,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameterfv")] public static - unsafe void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params) + unsafe void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Single* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetMinmaxParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params); + Delegates.glGetMinmaxParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Single*)@params); #if DEBUG } #endif @@ -46574,7 +46574,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameterfv")] public static - void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single[] @params) + void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Single[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46584,7 +46584,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* @params_ptr = @params) { - Delegates.glGetMinmaxParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Single*)@params_ptr); + Delegates.glGetMinmaxParameterfv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Single*)@params_ptr); } } #if DEBUG @@ -46614,13 +46614,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameteriv")] public static - unsafe void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params) + unsafe void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Int32* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetMinmaxParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params); + Delegates.glGetMinmaxParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Int32*)@params); #if DEBUG } #endif @@ -46647,7 +46647,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameteriv")] public static - void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32[] @params) + void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Int32[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46657,7 +46657,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Int32* @params_ptr = @params) { - Delegates.glGetMinmaxParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params_ptr); + Delegates.glGetMinmaxParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Int32*)@params_ptr); } } #if DEBUG @@ -46686,7 +46686,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameteriv")] public static - void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] out Int32 @params) + void GetMinmaxParameter(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] out Int32 @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46696,7 +46696,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Int32* @params_ptr = &@params) { - Delegates.glGetMinmaxParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.Version12Deprecated)pname, (Int32*)@params_ptr); + Delegates.glGetMinmaxParameteriv((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Int32*)@params_ptr); @params = *@params_ptr; } } @@ -53460,13 +53460,13 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glHistogram")] public static - void Histogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, Int32 width, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, bool sink) + void Histogram(OpenTK.Graphics.OpenGL.HistogramTarget target, Int32 width, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, bool sink) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glHistogram((OpenTK.Graphics.OpenGL.Version12Deprecated)target, (Int32)width, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (bool)sink); + Delegates.glHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (Int32)width, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (bool)sink); #if DEBUG } #endif @@ -64776,13 +64776,13 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glResetHistogram")] public static - void ResetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target) + void ResetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glResetHistogram((OpenTK.Graphics.OpenGL.Version12Deprecated)target); + Delegates.glResetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs index cb24dcc2..55c1209a 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs @@ -1651,13 +1651,13 @@ namespace OpenTK.Graphics.OpenGL internal extern static void GetConvolutionFilterEXT(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr image); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetConvolutionParameterfv", ExactSpelling = true)] - internal extern static unsafe void GetConvolutionParameterfv(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params); + internal extern static unsafe void GetConvolutionParameterfv(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Single* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetConvolutionParameterfvEXT", ExactSpelling = true)] internal extern static unsafe void GetConvolutionParameterfvEXT(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, [OutAttribute] Single* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetConvolutionParameteriv", ExactSpelling = true)] - internal extern static unsafe void GetConvolutionParameteriv(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params); + internal extern static unsafe void GetConvolutionParameteriv(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Int32* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetConvolutionParameterivEXT", ExactSpelling = true)] internal extern static unsafe void GetConvolutionParameterivEXT(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, [OutAttribute] Int32* @params); @@ -1723,19 +1723,19 @@ namespace OpenTK.Graphics.OpenGL internal extern static Int32 GetHandleARB(OpenTK.Graphics.OpenGL.ArbShaderObjects pname); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetHistogram", ExactSpelling = true)] - internal extern static void GetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values); + internal extern static void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetHistogramEXT", ExactSpelling = true)] internal extern static void GetHistogramEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetHistogramParameterfv", ExactSpelling = true)] - internal extern static unsafe void GetHistogramParameterfv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params); + internal extern static unsafe void GetHistogramParameterfv(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Single* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetHistogramParameterfvEXT", ExactSpelling = true)] internal extern static unsafe void GetHistogramParameterfvEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Single* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetHistogramParameteriv", ExactSpelling = true)] - internal extern static unsafe void GetHistogramParameteriv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params); + internal extern static unsafe void GetHistogramParameteriv(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Int32* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetHistogramParameterivEXT", ExactSpelling = true)] internal extern static unsafe void GetHistogramParameterivEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params); @@ -1834,13 +1834,13 @@ namespace OpenTK.Graphics.OpenGL internal extern static void GetMinmaxEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetMinmaxParameterfv", ExactSpelling = true)] - internal extern static unsafe void GetMinmaxParameterfv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params); + internal extern static unsafe void GetMinmaxParameterfv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Single* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetMinmaxParameterfvEXT", ExactSpelling = true)] internal extern static unsafe void GetMinmaxParameterfvEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Single* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetMinmaxParameteriv", ExactSpelling = true)] - internal extern static unsafe void GetMinmaxParameteriv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params); + internal extern static unsafe void GetMinmaxParameteriv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Int32* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetMinmaxParameterivEXT", ExactSpelling = true)] internal extern static unsafe void GetMinmaxParameterivEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params); @@ -2341,7 +2341,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static void HintPGI(OpenTK.Graphics.OpenGL.PgiMiscHints target, Int32 mode); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glHistogram", ExactSpelling = true)] - internal extern static void Histogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, Int32 width, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, bool sink); + internal extern static void Histogram(OpenTK.Graphics.OpenGL.HistogramTarget target, Int32 width, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, bool sink); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glHistogramEXT", ExactSpelling = true)] internal extern static void HistogramEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, Int32 width, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, bool sink); @@ -3856,7 +3856,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static unsafe void RequestResidentProgramsNV(Int32 n, UInt32* programs); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glResetHistogram", ExactSpelling = true)] - internal extern static void ResetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target); + internal extern static void ResetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glResetHistogramEXT", ExactSpelling = true)] internal extern static void ResetHistogramEXT(OpenTK.Graphics.OpenGL.ExtHistogram target); diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs index 5440f828..5de44b84 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs @@ -1649,13 +1649,13 @@ namespace OpenTK.Graphics.OpenGL internal delegate void GetConvolutionFilterEXT(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr image); internal static GetConvolutionFilterEXT glGetConvolutionFilterEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetConvolutionParameterfv(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params); + internal unsafe delegate void GetConvolutionParameterfv(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Single* @params); internal unsafe static GetConvolutionParameterfv glGetConvolutionParameterfv; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetConvolutionParameterfvEXT(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, [OutAttribute] Single* @params); internal unsafe static GetConvolutionParameterfvEXT glGetConvolutionParameterfvEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetConvolutionParameteriv(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params); + internal unsafe delegate void GetConvolutionParameteriv(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Int32* @params); internal unsafe static GetConvolutionParameteriv glGetConvolutionParameteriv; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetConvolutionParameterivEXT(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, [OutAttribute] Int32* @params); @@ -1721,19 +1721,19 @@ namespace OpenTK.Graphics.OpenGL internal delegate Int32 GetHandleARB(OpenTK.Graphics.OpenGL.ArbShaderObjects pname); internal static GetHandleARB glGetHandleARB; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void GetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values); + internal delegate void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values); internal static GetHistogram glGetHistogram; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void GetHistogramEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values); internal static GetHistogramEXT glGetHistogramEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetHistogramParameterfv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params); + internal unsafe delegate void GetHistogramParameterfv(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Single* @params); internal unsafe static GetHistogramParameterfv glGetHistogramParameterfv; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetHistogramParameterfvEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Single* @params); internal unsafe static GetHistogramParameterfvEXT glGetHistogramParameterfvEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetHistogramParameteriv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params); + internal unsafe delegate void GetHistogramParameteriv(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Int32* @params); internal unsafe static GetHistogramParameteriv glGetHistogramParameteriv; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetHistogramParameterivEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params); @@ -1832,13 +1832,13 @@ namespace OpenTK.Graphics.OpenGL internal delegate void GetMinmaxEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values); internal static GetMinmaxEXT glGetMinmaxEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetMinmaxParameterfv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Single* @params); + internal unsafe delegate void GetMinmaxParameterfv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Single* @params); internal unsafe static GetMinmaxParameterfv glGetMinmaxParameterfv; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetMinmaxParameterfvEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Single* @params); internal unsafe static GetMinmaxParameterfvEXT glGetMinmaxParameterfvEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetMinmaxParameteriv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.Version12Deprecated pname, [OutAttribute] Int32* @params); + internal unsafe delegate void GetMinmaxParameteriv(OpenTK.Graphics.OpenGL.Version12Deprecated target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Int32* @params); internal unsafe static GetMinmaxParameteriv glGetMinmaxParameteriv; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetMinmaxParameterivEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params); @@ -2339,7 +2339,7 @@ namespace OpenTK.Graphics.OpenGL internal delegate void HintPGI(OpenTK.Graphics.OpenGL.PgiMiscHints target, Int32 mode); internal static HintPGI glHintPGI; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void Histogram(OpenTK.Graphics.OpenGL.Version12Deprecated target, Int32 width, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, bool sink); + internal delegate void Histogram(OpenTK.Graphics.OpenGL.HistogramTarget target, Int32 width, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, bool sink); internal static Histogram glHistogram; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void HistogramEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, Int32 width, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, bool sink); @@ -3854,7 +3854,7 @@ namespace OpenTK.Graphics.OpenGL internal unsafe delegate void RequestResidentProgramsNV(Int32 n, UInt32* programs); internal unsafe static RequestResidentProgramsNV glRequestResidentProgramsNV; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void ResetHistogram(OpenTK.Graphics.OpenGL.Version12Deprecated target); + internal delegate void ResetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target); internal static ResetHistogram glResetHistogram; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void ResetHistogramEXT(OpenTK.Graphics.OpenGL.ExtHistogram target); diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs index 0b17da2b..6354948f 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs @@ -5408,6 +5408,8 @@ namespace OpenTK.Graphics.OpenGL public enum ColorTableParameterPName { + ColorTableScale = ((int)0X80d6), + ColorTableBias = ((int)0X80d7), } public enum ColorTableParameterPNameSgi @@ -5418,6 +5420,12 @@ namespace OpenTK.Graphics.OpenGL public enum ColorTableTarget { + ColorTable = ((int)0X80d0), + PostConvolutionColorTable = ((int)0X80d1), + PostColorMatrixColorTable = ((int)0X80d2), + ProxyColorTable = ((int)0X80d3), + ProxyPostConvolutionColorTable = ((int)0X80d4), + ProxyPostColorMatrixColorTable = ((int)0X80d5), } public enum ColorTableTargetSgi @@ -5447,6 +5455,9 @@ namespace OpenTK.Graphics.OpenGL public enum ConvolutionParameter { + ConvolutionBorderMode = ((int)0X8013), + ConvolutionFilterScale = ((int)0X8014), + ConvolutionFilterBias = ((int)0X8015), } public enum ConvolutionParameterExt @@ -5456,8 +5467,18 @@ namespace OpenTK.Graphics.OpenGL ConvolutionFilterBiasExt = ((int)0X8015), } + public enum ConvolutionParameterValue + { + Reduce = ((int)0X8016), + ConstantBorder = ((int)0X8151), + ReplicateBorder = ((int)0X8153), + } + public enum ConvolutionTarget { + Convolution1D = ((int)0X8010), + Convolution2D = ((int)0X8011), + Separable2D = ((int)0X8012), } public enum ConvolutionTargetExt @@ -5632,9 +5653,13 @@ namespace OpenTK.Graphics.OpenGL Light5 = ((int)0X4005), Light6 = ((int)0X4006), Light7 = ((int)0X4007), + Convolution1D = ((int)0X8010), Convolution1DExt = ((int)0X8010), + Convolution2D = ((int)0X8011), Convolution2DExt = ((int)0X8011), + Separable2D = ((int)0X8012), Separable2DExt = ((int)0X8012), + Histogram = ((int)0X8024), HistogramExt = ((int)0X8024), MinmaxExt = ((int)0X802e), PolygonOffsetFill = ((int)0X8037), @@ -5656,8 +5681,11 @@ namespace OpenTK.Graphics.OpenGL SampleCoverage = ((int)0X80a0), SampleMaskSgis = ((int)0X80a0), TextureColorTableSgi = ((int)0X80bc), + ColorTable = ((int)0X80d0), ColorTableSgi = ((int)0X80D0), + PostConvolutionColorTable = ((int)0X80d1), PostConvolutionColorTableSgi = ((int)0X80D1), + PostColorMatrixColorTable = ((int)0X80d2), PostColorMatrixColorTableSgi = ((int)0X80D2), Texture4DSgis = ((int)0X8134), PixelTexGenSgix = ((int)0X8139), @@ -6970,6 +6998,16 @@ namespace OpenTK.Graphics.OpenGL public enum GetColorTableParameterPName { + ColorTableScale = ((int)0X80d6), + ColorTableBias = ((int)0X80d7), + ColorTableFormat = ((int)0X80d8), + ColorTableWidth = ((int)0X80d9), + ColorTableRedSize = ((int)0X80da), + ColorTableGreenSize = ((int)0X80db), + ColorTableBlueSize = ((int)0X80dc), + ColorTableAlphaSize = ((int)0X80dd), + ColorTableLuminanceSize = ((int)0X80de), + ColorTableIntensitySize = ((int)0X80df), } public enum GetColorTableParameterPNameSgi @@ -6998,6 +7036,31 @@ namespace OpenTK.Graphics.OpenGL MaxConvolutionHeightExt = ((int)0X801b), } + public enum GetConvolutionParameterPName + { + ConvolutionBorderMode = ((int)0X8013), + ConvolutionFilterScale = ((int)0X8014), + ConvolutionFilterBias = ((int)0X8015), + ConvolutionFormat = ((int)0X8017), + ConvolutionWidth = ((int)0X8018), + ConvolutionHeight = ((int)0X8019), + MaxConvolutionWidth = ((int)0X801a), + MaxConvolutionHeight = ((int)0X801b), + ConvolutionBorderColor = ((int)0X8154), + } + + public enum GetHistogramParameterPName + { + HistogramWidth = ((int)0X8026), + HistogramFormat = ((int)0X8027), + HistogramRedSize = ((int)0X8028), + HistogramGreenSize = ((int)0X8029), + HistogramBlueSize = ((int)0X802a), + HistogramAlphaSize = ((int)0X802b), + HistogramLuminanceSize = ((int)0X802c), + HistogramSink = ((int)0X802d), + } + public enum GetHistogramParameterPNameExt { HistogramWidthExt = ((int)0X8026), @@ -7027,6 +7090,12 @@ namespace OpenTK.Graphics.OpenGL Domain = ((int)0X0a02), } + public enum GetMinmaxParameterPName + { + MinmaxFormat = ((int)0X802f), + MinmaxSink = ((int)0X8030), + } + public enum GetMinmaxParameterPNameExt { MinmaxFormatExt = ((int)0X802f), @@ -7719,6 +7788,12 @@ namespace OpenTK.Graphics.OpenGL FragmentShaderDerivativeHint = ((int)0X8b8b), } + public enum HistogramTarget + { + Histogram = ((int)0X8024), + ProxyHistogram = ((int)0X8025), + } + public enum HistogramTargetExt { HistogramExt = ((int)0X8024), @@ -8107,6 +8182,11 @@ namespace OpenTK.Graphics.OpenGL Fill = ((int)0X1b02), } + public enum MinMaxTarget + { + Minmax = ((int)0X802e), + } + public enum MinmaxTargetExt { MinmaxExt = ((int)0X802e), @@ -9380,6 +9460,11 @@ namespace OpenTK.Graphics.OpenGL Gl4Pass3Sgis = ((int)0X80a7), } + public enum SeparableFilterTarget + { + Separable2D = ((int)0X8012), + } + public enum SeparableTargetExt { Separable2DExt = ((int)0X8012),