From 0d5af734652d5065d7d6484543d90314f17f6c3e Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sun, 29 Mar 2009 14:49:28 +0000 Subject: [PATCH] Updated tokens for EXT_gpu_shader4 (issue [#604]). --- Source/Bind/Specifications/GL2/enumext.spec | 64 ++++++++++++----- Source/Bind/Specifications/GL2/gl.spec | 10 +-- Source/OpenTK/Graphics/GL/GL.cs | 80 ++++++++++----------- Source/OpenTK/Graphics/GL/GLCore.cs | 8 +-- Source/OpenTK/Graphics/GL/GLDelegates.cs | 8 +-- Source/OpenTK/Graphics/GL/GLEnums.cs | 38 +++++----- 6 files changed, 117 insertions(+), 91 deletions(-) diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index abf864f7..0617b8ac 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -514,10 +514,10 @@ VERSION_3_0 enum: # RGB32F = 0x8815 # RGBA16F = 0x881A # RGB16F = 0x881B - VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD +# VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD # MAX_ARRAY_TEXTURE_LAYERS = 0x88FF - MIN_PROGRAM_TEXEL_OFFSET = 0x8904 - MAX_PROGRAM_TEXEL_OFFSET = 0x8905 +# MIN_PROGRAM_TEXEL_OFFSET = 0x8904 +# MAX_PROGRAM_TEXEL_OFFSET = 0x8905 # CLAMP_VERTEX_COLOR = 0x891A # CLAMP_FRAGMENT_COLOR = 0x891B # CLAMP_READ_COLOR = 0x891C @@ -581,22 +581,22 @@ VERSION_3_0 enum: # SAMPLER_2D_ARRAY = 0x8DC1 # SAMPLER_1D_ARRAY_SHADOW = 0x8DC3 # SAMPLER_2D_ARRAY_SHADOW = 0x8DC4 - SAMPLER_CUBE_SHADOW = 0x8DC5 - UNSIGNED_INT_VEC2 = 0x8DC6 - UNSIGNED_INT_VEC3 = 0x8DC7 - UNSIGNED_INT_VEC4 = 0x8DC8 - INT_SAMPLER_1D = 0x8DC9 - INT_SAMPLER_2D = 0x8DCA - INT_SAMPLER_3D = 0x8DCB - INT_SAMPLER_CUBE = 0x8DCC - INT_SAMPLER_1D_ARRAY = 0x8DCE - INT_SAMPLER_2D_ARRAY = 0x8DCF - UNSIGNED_INT_SAMPLER_1D = 0x8DD1 - UNSIGNED_INT_SAMPLER_2D = 0x8DD2 - UNSIGNED_INT_SAMPLER_3D = 0x8DD3 - UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4 - UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6 - UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7 +# SAMPLER_CUBE_SHADOW = 0x8DC5 +# UNSIGNED_INT_VEC2 = 0x8DC6 +# UNSIGNED_INT_VEC3 = 0x8DC7 +# UNSIGNED_INT_VEC4 = 0x8DC8 +# INT_SAMPLER_1D = 0x8DC9 +# INT_SAMPLER_2D = 0x8DCA +# INT_SAMPLER_3D = 0x8DCB +# INT_SAMPLER_CUBE = 0x8DCC +# INT_SAMPLER_1D_ARRAY = 0x8DCE +# INT_SAMPLER_2D_ARRAY = 0x8DCF +# UNSIGNED_INT_SAMPLER_1D = 0x8DD1 +# UNSIGNED_INT_SAMPLER_2D = 0x8DD2 +# UNSIGNED_INT_SAMPLER_3D = 0x8DD3 +# UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4 +# UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6 +# UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7 QUERY_WAIT = 0x8E13 QUERY_NO_WAIT = 0x8E14 QUERY_BY_REGION_WAIT = 0x8E15 @@ -6418,4 +6418,30 @@ TexCoordPointerType enum: GetPName enum: use ARB_vertex_array_object VERTEX_ARRAY_BINDING +# Promoted from EXT_gpu_shader4 +VertexAttribParameter enum: + VERTEX_ATTRIB_ARRAY_INTEGER = 0x88FD + +ActiveUniformType enum: + SAMPLER_CUBE_SHADOW = 0x8DC5 + UNSIGNED_INT_VEC2 = 0x8DC6 + UNSIGNED_INT_VEC3 = 0x8DC7 + UNSIGNED_INT_VEC4 = 0x8DC8 + INT_SAMPLER_1D = 0x8DC9 + INT_SAMPLER_2D = 0x8DCA + INT_SAMPLER_3D = 0x8DCB + INT_SAMPLER_CUBE = 0x8DCC + INT_SAMPLER_1D_ARRAY = 0x8DCE + INT_SAMPLER_2D_ARRAY = 0x8DCF + UNSIGNED_INT_SAMPLER_1D = 0x8DD1 + UNSIGNED_INT_SAMPLER_2D = 0x8DD2 + UNSIGNED_INT_SAMPLER_3D = 0x8DD3 + UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4 + UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6 + UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7 + +GetPName enum: + MIN_PROGRAM_TEXEL_OFFSET = 0x8904 + MAX_PROGRAM_TEXEL_OFFSET = 0x8905 + # 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 8f357351..c8feb69d 100644 --- a/Source/Bind/Specifications/GL2/gl.spec +++ b/Source/Bind/Specifications/GL2/gl.spec @@ -5800,8 +5800,8 @@ GetBufferPointerv(target, pname, params) BlendEquationSeparate(modeRGB, modeAlpha) return void - param modeRGB BlendEquationModeEXT in value - param modeAlpha BlendEquationModeEXT in value + param modeRGB BlendEquationMode in value # BlendEquationModeEXT in value + param modeAlpha BlendEquationMode in value # BlendEquationModeEXT in value category VERSION_2_0 version 2.0 extension @@ -7571,7 +7571,7 @@ VertexAttribIPointer(index, size, type, stride, pointer) return void param index UInt32 in value param size Int32 in value - param type VertexAttribEnum in value + param type VertexAttribParameter in value # VertexAttribEnum in value param stride SizeI in value param pointer Void in array [COMPSIZE(size/type/stride)] retained category VERSION_3_0 @@ -7585,7 +7585,7 @@ VertexAttribIPointer(index, size, type, stride, pointer) GetVertexAttribIiv(index, pname, params) return void param index UInt32 in value - param pname VertexAttribEnum in value + param pname VertexAttribParameter in value # VertexAttribEnum in value param params Int32 out array [1] category VERSION_3_0 version 3.0 @@ -7598,7 +7598,7 @@ GetVertexAttribIiv(index, pname, params) GetVertexAttribIuiv(index, pname, params) return void param index UInt32 in value - param pname VertexAttribEnum in value + param pname VertexAttribParameter in value # VertexAttribEnum in value param params UInt32 out array [1] category VERSION_3_0 version 3.0 diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs index df492ff6..d1183301 100644 --- a/Source/OpenTK/Graphics/GL/GL.cs +++ b/Source/OpenTK/Graphics/GL/GL.cs @@ -38820,13 +38820,13 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glBlendEquationSeparate")] public static - void BlendEquationSeparate(OpenTK.Graphics.All modeRGB, OpenTK.Graphics.All modeAlpha) + void BlendEquationSeparate(OpenTK.Graphics.BlendEquationMode modeRGB, OpenTK.Graphics.BlendEquationMode modeAlpha) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glBlendEquationSeparate((OpenTK.Graphics.All)modeRGB, (OpenTK.Graphics.All)modeAlpha); + Delegates.glBlendEquationSeparate((OpenTK.Graphics.BlendEquationMode)modeRGB, (OpenTK.Graphics.BlendEquationMode)modeAlpha); #if DEBUG } #endif @@ -51478,13 +51478,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, IntPtr pointer) + void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, IntPtr pointer) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer); #if DEBUG } #endif @@ -51492,13 +51492,13 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, IntPtr pointer) + void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, IntPtr pointer) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer); #if DEBUG } #endif @@ -51507,7 +51507,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, [In, Out] ref T4 pointer) + void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, [In, Out] ref T4 pointer) where T4 : struct { #if DEBUG @@ -51517,7 +51517,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -51530,7 +51530,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, [In, Out] ref T4 pointer) + void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, [In, Out] ref T4 pointer) where T4 : struct { #if DEBUG @@ -51540,7 +51540,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -51554,7 +51554,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, [In, Out] T4[] pointer) + void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, [In, Out] T4[] pointer) where T4 : struct { #if DEBUG @@ -51564,7 +51564,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -51577,7 +51577,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, [In, Out] T4[] pointer) + void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, [In, Out] T4[] pointer) where T4 : struct { #if DEBUG @@ -51587,7 +51587,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -51601,7 +51601,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, [In, Out] T4[,] pointer) + void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, [In, Out] T4[,] pointer) where T4 : struct { #if DEBUG @@ -51611,7 +51611,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -51624,7 +51624,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, [In, Out] T4[,] pointer) + void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, [In, Out] T4[,] pointer) where T4 : struct { #if DEBUG @@ -51634,7 +51634,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -51648,7 +51648,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, [In, Out] T4[,,] pointer) + void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, [In, Out] T4[,,] pointer) where T4 : struct { #if DEBUG @@ -51658,7 +51658,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -51671,7 +51671,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")] public static - void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, [In, Out] T4[,,] pointer) + void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, [In, Out] T4[,,] pointer) where T4 : struct { #if DEBUG @@ -51681,7 +51681,7 @@ namespace OpenTK.Graphics GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned); try { - Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.Version30)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); + Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.VertexAttribParameter)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject()); } finally { @@ -51695,7 +51695,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")] public static - void GetVertexAttribI(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] Int32[] @params) + void GetVertexAttribI(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] Int32[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -51705,7 +51705,7 @@ namespace OpenTK.Graphics { fixed (Int32* @params_ptr = @params) { - Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (Int32*)@params_ptr); + Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (Int32*)@params_ptr); } } #if DEBUG @@ -51715,7 +51715,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")] public static - void GetVertexAttribI(Int32 index, OpenTK.Graphics.Version30 pname, [Out] Int32[] @params) + void GetVertexAttribI(Int32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] Int32[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -51725,7 +51725,7 @@ namespace OpenTK.Graphics { fixed (Int32* @params_ptr = @params) { - Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (Int32*)@params_ptr); + Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (Int32*)@params_ptr); } } #if DEBUG @@ -51736,7 +51736,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")] public static - void GetVertexAttribI(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] out Int32 @params) + void GetVertexAttribI(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] out Int32 @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -51746,7 +51746,7 @@ namespace OpenTK.Graphics { fixed (Int32* @params_ptr = &@params) { - Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (Int32*)@params_ptr); + Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (Int32*)@params_ptr); @params = *@params_ptr; } } @@ -51757,7 +51757,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")] public static - void GetVertexAttribI(Int32 index, OpenTK.Graphics.Version30 pname, [Out] out Int32 @params) + void GetVertexAttribI(Int32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] out Int32 @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -51767,7 +51767,7 @@ namespace OpenTK.Graphics { fixed (Int32* @params_ptr = &@params) { - Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (Int32*)@params_ptr); + Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (Int32*)@params_ptr); @params = *@params_ptr; } } @@ -51779,13 +51779,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")] public static - unsafe void GetVertexAttribI(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] Int32* @params) + unsafe void GetVertexAttribI(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] Int32* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (Int32*)@params); + Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (Int32*)@params); #if DEBUG } #endif @@ -51794,13 +51794,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")] public static - unsafe void GetVertexAttribI(Int32 index, OpenTK.Graphics.Version30 pname, [Out] Int32* @params) + unsafe void GetVertexAttribI(Int32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] Int32* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (Int32*)@params); + Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (Int32*)@params); #if DEBUG } #endif @@ -51809,7 +51809,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIuiv")] public static - void GetVertexAttribI(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] UInt32[] @params) + void GetVertexAttribI(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] UInt32[] @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -51819,7 +51819,7 @@ namespace OpenTK.Graphics { fixed (UInt32* @params_ptr = @params) { - Delegates.glGetVertexAttribIuiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (UInt32*)@params_ptr); + Delegates.glGetVertexAttribIuiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (UInt32*)@params_ptr); } } #if DEBUG @@ -51830,7 +51830,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIuiv")] public static - void GetVertexAttribI(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] out UInt32 @params) + void GetVertexAttribI(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] out UInt32 @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -51840,7 +51840,7 @@ namespace OpenTK.Graphics { fixed (UInt32* @params_ptr = &@params) { - Delegates.glGetVertexAttribIuiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (UInt32*)@params_ptr); + Delegates.glGetVertexAttribIuiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (UInt32*)@params_ptr); @params = *@params_ptr; } } @@ -51852,13 +51852,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIuiv")] public static - unsafe void GetVertexAttribI(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] UInt32* @params) + unsafe void GetVertexAttribI(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] UInt32* @params) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetVertexAttribIuiv((UInt32)index, (OpenTK.Graphics.Version30)pname, (UInt32*)@params); + Delegates.glGetVertexAttribIuiv((UInt32)index, (OpenTK.Graphics.VertexAttribParameter)pname, (UInt32*)@params); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/GL/GLCore.cs b/Source/OpenTK/Graphics/GL/GLCore.cs index b50a7563..8d2e526e 100644 --- a/Source/OpenTK/Graphics/GL/GLCore.cs +++ b/Source/OpenTK/Graphics/GL/GLCore.cs @@ -1489,7 +1489,7 @@ namespace OpenTK.Graphics internal extern static void GetBufferPointerv(OpenTK.Graphics.BufferTarget target, OpenTK.Graphics.BufferPointer pname, [Out] IntPtr @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationSeparate", ExactSpelling = true)] - internal extern static void BlendEquationSeparate(OpenTK.Graphics.All modeRGB, OpenTK.Graphics.All modeAlpha); + internal extern static void BlendEquationSeparate(OpenTK.Graphics.BlendEquationMode modeRGB, OpenTK.Graphics.BlendEquationMode modeAlpha); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDrawBuffers", ExactSpelling = true)] internal extern static unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.DrawBuffersEnum* bufs); @@ -1891,13 +1891,13 @@ namespace OpenTK.Graphics internal extern static unsafe void VertexAttribI4usv(UInt32 index, UInt16* v); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glVertexAttribIPointer", ExactSpelling = true)] - internal extern static void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, IntPtr pointer); + internal extern static void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, IntPtr pointer); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetVertexAttribIiv", ExactSpelling = true)] - internal extern static unsafe void GetVertexAttribIiv(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] Int32* @params); + internal extern static unsafe void GetVertexAttribIiv(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] Int32* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetVertexAttribIuiv", ExactSpelling = true)] - internal extern static unsafe void GetVertexAttribIuiv(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] UInt32* @params); + internal extern static unsafe void GetVertexAttribIuiv(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] UInt32* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetUniformuiv", ExactSpelling = true)] internal extern static unsafe void GetUniformuiv(UInt32 program, Int32 location, [Out] UInt32* @params); diff --git a/Source/OpenTK/Graphics/GL/GLDelegates.cs b/Source/OpenTK/Graphics/GL/GLDelegates.cs index 86a41e4e..a731a25e 100644 --- a/Source/OpenTK/Graphics/GL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/GL/GLDelegates.cs @@ -1490,7 +1490,7 @@ namespace OpenTK.Graphics internal delegate void GetBufferPointerv(OpenTK.Graphics.BufferTarget target, OpenTK.Graphics.BufferPointer pname, [Out] IntPtr @params); internal static GetBufferPointerv glGetBufferPointerv; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void BlendEquationSeparate(OpenTK.Graphics.All modeRGB, OpenTK.Graphics.All modeAlpha); + internal delegate void BlendEquationSeparate(OpenTK.Graphics.BlendEquationMode modeRGB, OpenTK.Graphics.BlendEquationMode modeAlpha); internal static BlendEquationSeparate glBlendEquationSeparate; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void DrawBuffers(Int32 n, OpenTK.Graphics.DrawBuffersEnum* bufs); @@ -1892,13 +1892,13 @@ namespace OpenTK.Graphics internal unsafe delegate void VertexAttribI4usv(UInt32 index, UInt16* v); internal unsafe static VertexAttribI4usv glVertexAttribI4usv; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.Version30 type, Int32 stride, IntPtr pointer); + internal delegate void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.VertexAttribParameter type, Int32 stride, IntPtr pointer); internal static VertexAttribIPointer glVertexAttribIPointer; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetVertexAttribIiv(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] Int32* @params); + internal unsafe delegate void GetVertexAttribIiv(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] Int32* @params); internal unsafe static GetVertexAttribIiv glGetVertexAttribIiv; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetVertexAttribIuiv(UInt32 index, OpenTK.Graphics.Version30 pname, [Out] UInt32* @params); + internal unsafe delegate void GetVertexAttribIuiv(UInt32 index, OpenTK.Graphics.VertexAttribParameter pname, [Out] UInt32* @params); internal unsafe static GetVertexAttribIuiv glGetVertexAttribIuiv; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetUniformuiv(UInt32 program, Int32 location, [Out] UInt32* @params); diff --git a/Source/OpenTK/Graphics/GL/GLEnums.cs b/Source/OpenTK/Graphics/GL/GLEnums.cs index 47dd5b36..6c910634 100644 --- a/Source/OpenTK/Graphics/GL/GLEnums.cs +++ b/Source/OpenTK/Graphics/GL/GLEnums.cs @@ -1029,6 +1029,8 @@ namespace OpenTK.Graphics PixelPackBufferBinding = ((int)0X88ed), PixelUnpackBufferBinding = ((int)0X88ef), MaxArrayTextureLayers = ((int)0X88ff), + MinProgramTexelOffset = ((int)0X8904), + MaxProgramTexelOffset = ((int)0X8905), ClampVertexColor = ((int)0X891a), ClampFragmentColor = ((int)0X891b), ClampReadColor = ((int)0X891c), @@ -6370,9 +6372,6 @@ namespace OpenTK.Graphics ContextFlags = ((int)0X821e), DepthBuffer = ((int)0X8223), StencilBuffer = ((int)0X8224), - VertexAttribArrayInteger = ((int)0X88fd), - MinProgramTexelOffset = ((int)0X8904), - MaxProgramTexelOffset = ((int)0X8905), MaxVaryingComponents = ((int)0X8b4b), UnsignedNormalized = ((int)0X8c17), UnsignedInt10F11F11FRev = ((int)0X8c3b), @@ -6392,22 +6391,6 @@ namespace OpenTK.Graphics SeparateAttribs = ((int)0X8c8d), TransformFeedbackBuffer = ((int)0X8c8e), TransformFeedbackBufferBinding = ((int)0X8c8f), - SamplerCubeShadow = ((int)0X8dc5), - UnsignedIntVec2 = ((int)0X8dc6), - UnsignedIntVec3 = ((int)0X8dc7), - UnsignedIntVec4 = ((int)0X8dc8), - IntSampler1D = ((int)0X8dc9), - IntSampler2D = ((int)0X8dca), - IntSampler3D = ((int)0X8dcb), - IntSamplerCube = ((int)0X8dcc), - IntSampler1DArray = ((int)0X8dce), - IntSampler2DArray = ((int)0X8dcf), - UnsignedIntSampler1D = ((int)0X8dd1), - UnsignedIntSampler2D = ((int)0X8dd2), - UnsignedIntSampler3D = ((int)0X8dd3), - UnsignedIntSamplerCube = ((int)0X8dd4), - UnsignedIntSampler1DArray = ((int)0X8dd6), - UnsignedIntSampler2DArray = ((int)0X8dd7), QueryWait = ((int)0X8e13), QueryNoWait = ((int)0X8e14), QueryByRegionWait = ((int)0X8e15), @@ -9732,6 +9715,22 @@ namespace OpenTK.Graphics Sampler2DArray = ((int)0X8dc1), Sampler1DArrayShadow = ((int)0X8dc3), Sampler2DArrayShadow = ((int)0X8dc4), + SamplerCubeShadow = ((int)0X8dc5), + UnsignedIntVec2 = ((int)0X8dc6), + UnsignedIntVec3 = ((int)0X8dc7), + UnsignedIntVec4 = ((int)0X8dc8), + IntSampler1D = ((int)0X8dc9), + IntSampler2D = ((int)0X8dca), + IntSampler3D = ((int)0X8dcb), + IntSamplerCube = ((int)0X8dcc), + IntSampler1DArray = ((int)0X8dce), + IntSampler2DArray = ((int)0X8dcf), + UnsignedIntSampler1D = ((int)0X8dd1), + UnsignedIntSampler2D = ((int)0X8dd2), + UnsignedIntSampler3D = ((int)0X8dd3), + UnsignedIntSamplerCube = ((int)0X8dd4), + UnsignedIntSampler1DArray = ((int)0X8dd6), + UnsignedIntSampler2DArray = ((int)0X8dd7), } public enum ActiveAttribType @@ -9788,6 +9787,7 @@ namespace OpenTK.Graphics ArrayType = ((int)0X8625), CurrentVertexAttrib = ((int)0X8626), ArrayNormalized = ((int)0X886a), + VertexAttribArrayInteger = ((int)0X88fd), } public enum VertexAttribPointerParameter