diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index 722b41e7..4f677455 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -6490,6 +6490,9 @@ GetPName enum: IndexedStringName enum: use StringName EXTENSIONS # Used in GetStringi +IndexedEnableCap enum: + use GetPName BLEND + # Version 3.1 # Promoted from ARB_copy_buffer @@ -6497,6 +6500,31 @@ BufferTarget enum: use ARB_copy_buffer COPY_READ_BUFFER use ARB_copy_buffer COPY_WRITE_BUFFER +# Promoted from ARB_uniform_buffer_object +BufferTarget enum: + use ARB_uniform_buffer_object UNIFORM_BUFFER + +GetPName enum: + use ARB_uniform_buffer_object MAX_VERTEX_UNIFORM_BLOCKS + use ARB_uniform_buffer_object MAX_GEOMETRY_UNIFORM_BLOCKS + use ARB_uniform_buffer_object MAX_FRAGMENT_UNIFORM_BLOCKS + use ARB_uniform_buffer_object MAX_COMBINED_UNIFORM_BLOCKS + use ARB_uniform_buffer_object MAX_UNIFORM_BUFFER_BINDINGS + use ARB_uniform_buffer_object MAX_UNIFORM_BLOCK_SIZE + use ARB_uniform_buffer_object MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS + use ARB_uniform_buffer_object MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS + use ARB_uniform_buffer_object MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS + use ARB_uniform_buffer_object UNIFORM_BUFFER_OFFSET_ALIGNMENT + +GetIndexedPName enum: + use ARB_uniform_buffer_object UNIFORM_BUFFER_BINDING + use ARB_uniform_buffer_object UNIFORM_BUFFER_START + use ARB_uniform_buffer_object UNIFORM_BUFFER_SIZE + +AssemblyProgramParameterARB enum: + use ARB_uniform_buffer_object ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH + use ARB_uniform_buffer_object ACTIVE_UNIFORM_BLOCKS + # Non-core # APPLE_flush_buffer_range diff --git a/Source/Bind/Specifications/GL2/gl.spec b/Source/Bind/Specifications/GL2/gl.spec index ef3d3b7e..4223ecb6 100644 --- a/Source/Bind/Specifications/GL2/gl.spec +++ b/Source/Bind/Specifications/GL2/gl.spec @@ -7127,7 +7127,7 @@ ColorMaski(index, r, g, b, a) GetBooleani_v(target, index, data) return void - param target GLenum in value + param target GetIndexedPName in value # GLenum in value param index UInt32 in value param data Boolean out array [COMPSIZE(target)] category VERSION_3_0 @@ -7140,7 +7140,7 @@ GetBooleani_v(target, index, data) GetIntegeri_v(target, index, data) return void - param target GLenum in value + param target GetIndexedPName in value # GLenum in value param index UInt32 in value param data Int32 out array [COMPSIZE(target)] category VERSION_3_0 @@ -7153,7 +7153,7 @@ GetIntegeri_v(target, index, data) Enablei(target, index) return void - param target GLenum in value + param target IndexedEnableCap in value # GLenum in value param index UInt32 in value category VERSION_3_0 version 3.0 @@ -7164,7 +7164,7 @@ Enablei(target, index) Disablei(target, index) return void - param target GLenum in value + param target IndexedEnableCap in value # GLenum in value param index UInt32 in value category VERSION_3_0 version 3.0 @@ -7175,7 +7175,7 @@ Disablei(target, index) IsEnabledi(target, index) return Boolean - param target GLenum in value + param target IndexedEnableCap in value # GLenum in value param index UInt32 in value category VERSION_3_0 version 3.0 @@ -7210,7 +7210,7 @@ EndTransformFeedback() BindBufferRange(target, index, buffer, offset, size) return void - param target GLenum in value + param target BufferTarget in value # GLenum in value param index UInt32 in value param buffer UInt32 in value param offset BufferOffset in value @@ -7225,7 +7225,7 @@ BindBufferRange(target, index, buffer, offset, size) BindBufferBase(target, index, buffer) return void - param target GLenum in value + param target BufferTarget in value # GLenum in value param index UInt32 in value param buffer UInt32 in value category VERSION_3_0 diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs index 1af79810..1999da22 100644 --- a/Source/OpenTK/Graphics/GL/GL.cs +++ b/Source/OpenTK/Graphics/GL/GL.cs @@ -49716,7 +49716,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")] public static - void GetBoolean(OpenTK.Graphics.Version30 target, UInt32 index, [Out] bool[] data) + void GetBoolean(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] bool[] data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -49726,7 +49726,7 @@ namespace OpenTK.Graphics { fixed (bool* data_ptr = data) { - Delegates.glGetBooleani_v((OpenTK.Graphics.Version30)target, (UInt32)index, (bool*)data_ptr); + Delegates.glGetBooleani_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (bool*)data_ptr); } } #if DEBUG @@ -49736,7 +49736,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")] public static - void GetBoolean(OpenTK.Graphics.Version30 target, Int32 index, [Out] bool[] data) + void GetBoolean(OpenTK.Graphics.GetIndexedPName target, Int32 index, [Out] bool[] data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -49746,7 +49746,7 @@ namespace OpenTK.Graphics { fixed (bool* data_ptr = data) { - Delegates.glGetBooleani_v((OpenTK.Graphics.Version30)target, (UInt32)index, (bool*)data_ptr); + Delegates.glGetBooleani_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (bool*)data_ptr); } } #if DEBUG @@ -49757,7 +49757,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")] public static - void GetBoolean(OpenTK.Graphics.Version30 target, UInt32 index, [Out] out bool data) + void GetBoolean(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] out bool data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -49767,7 +49767,7 @@ namespace OpenTK.Graphics { fixed (bool* data_ptr = &data) { - Delegates.glGetBooleani_v((OpenTK.Graphics.Version30)target, (UInt32)index, (bool*)data_ptr); + Delegates.glGetBooleani_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (bool*)data_ptr); data = *data_ptr; } } @@ -49778,7 +49778,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")] public static - void GetBoolean(OpenTK.Graphics.Version30 target, Int32 index, [Out] out bool data) + void GetBoolean(OpenTK.Graphics.GetIndexedPName target, Int32 index, [Out] out bool data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -49788,7 +49788,7 @@ namespace OpenTK.Graphics { fixed (bool* data_ptr = &data) { - Delegates.glGetBooleani_v((OpenTK.Graphics.Version30)target, (UInt32)index, (bool*)data_ptr); + Delegates.glGetBooleani_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (bool*)data_ptr); data = *data_ptr; } } @@ -49800,13 +49800,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")] public static - unsafe void GetBoolean(OpenTK.Graphics.Version30 target, UInt32 index, [Out] bool* data) + unsafe void GetBoolean(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] bool* data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetBooleani_v((OpenTK.Graphics.Version30)target, (UInt32)index, (bool*)data); + Delegates.glGetBooleani_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (bool*)data); #if DEBUG } #endif @@ -49815,13 +49815,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")] public static - unsafe void GetBoolean(OpenTK.Graphics.Version30 target, Int32 index, [Out] bool* data) + unsafe void GetBoolean(OpenTK.Graphics.GetIndexedPName target, Int32 index, [Out] bool* data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetBooleani_v((OpenTK.Graphics.Version30)target, (UInt32)index, (bool*)data); + Delegates.glGetBooleani_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (bool*)data); #if DEBUG } #endif @@ -49830,7 +49830,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")] public static - void GetInteger(OpenTK.Graphics.Version30 target, UInt32 index, [Out] Int32[] data) + void GetInteger(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] Int32[] data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -49840,7 +49840,7 @@ namespace OpenTK.Graphics { fixed (Int32* data_ptr = data) { - Delegates.glGetIntegeri_v((OpenTK.Graphics.Version30)target, (UInt32)index, (Int32*)data_ptr); + Delegates.glGetIntegeri_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (Int32*)data_ptr); } } #if DEBUG @@ -49850,7 +49850,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")] public static - void GetInteger(OpenTK.Graphics.Version30 target, Int32 index, [Out] Int32[] data) + void GetInteger(OpenTK.Graphics.GetIndexedPName target, Int32 index, [Out] Int32[] data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -49860,7 +49860,7 @@ namespace OpenTK.Graphics { fixed (Int32* data_ptr = data) { - Delegates.glGetIntegeri_v((OpenTK.Graphics.Version30)target, (UInt32)index, (Int32*)data_ptr); + Delegates.glGetIntegeri_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (Int32*)data_ptr); } } #if DEBUG @@ -49871,7 +49871,7 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")] public static - void GetInteger(OpenTK.Graphics.Version30 target, UInt32 index, [Out] out Int32 data) + void GetInteger(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] out Int32 data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -49881,7 +49881,7 @@ namespace OpenTK.Graphics { fixed (Int32* data_ptr = &data) { - Delegates.glGetIntegeri_v((OpenTK.Graphics.Version30)target, (UInt32)index, (Int32*)data_ptr); + Delegates.glGetIntegeri_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (Int32*)data_ptr); data = *data_ptr; } } @@ -49892,7 +49892,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")] public static - void GetInteger(OpenTK.Graphics.Version30 target, Int32 index, [Out] out Int32 data) + void GetInteger(OpenTK.Graphics.GetIndexedPName target, Int32 index, [Out] out Int32 data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -49902,7 +49902,7 @@ namespace OpenTK.Graphics { fixed (Int32* data_ptr = &data) { - Delegates.glGetIntegeri_v((OpenTK.Graphics.Version30)target, (UInt32)index, (Int32*)data_ptr); + Delegates.glGetIntegeri_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (Int32*)data_ptr); data = *data_ptr; } } @@ -49914,13 +49914,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")] public static - unsafe void GetInteger(OpenTK.Graphics.Version30 target, UInt32 index, [Out] Int32* data) + unsafe void GetInteger(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] Int32* data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetIntegeri_v((OpenTK.Graphics.Version30)target, (UInt32)index, (Int32*)data); + Delegates.glGetIntegeri_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (Int32*)data); #if DEBUG } #endif @@ -49929,13 +49929,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")] public static - unsafe void GetInteger(OpenTK.Graphics.Version30 target, Int32 index, [Out] Int32* data) + unsafe void GetInteger(OpenTK.Graphics.GetIndexedPName target, Int32 index, [Out] Int32* data) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetIntegeri_v((OpenTK.Graphics.Version30)target, (UInt32)index, (Int32*)data); + Delegates.glGetIntegeri_v((OpenTK.Graphics.GetIndexedPName)target, (UInt32)index, (Int32*)data); #if DEBUG } #endif @@ -49953,13 +49953,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glEnablei")] public static - void Enable(OpenTK.Graphics.Version30 target, UInt32 index) + void Enable(OpenTK.Graphics.IndexedEnableCap target, UInt32 index) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glEnablei((OpenTK.Graphics.Version30)target, (UInt32)index); + Delegates.glEnablei((OpenTK.Graphics.IndexedEnableCap)target, (UInt32)index); #if DEBUG } #endif @@ -49976,21 +49976,21 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glEnablei")] public static - void Enable(OpenTK.Graphics.Version30 target, Int32 index) + void Enable(OpenTK.Graphics.IndexedEnableCap target, Int32 index) { - Delegates.glEnablei((OpenTK.Graphics.Version30)target, (UInt32)index); + Delegates.glEnablei((OpenTK.Graphics.IndexedEnableCap)target, (UInt32)index); } [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glDisablei")] public static - void Disable(OpenTK.Graphics.Version30 target, UInt32 index) + void Disable(OpenTK.Graphics.IndexedEnableCap target, UInt32 index) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glDisablei((OpenTK.Graphics.Version30)target, (UInt32)index); + Delegates.glDisablei((OpenTK.Graphics.IndexedEnableCap)target, (UInt32)index); #if DEBUG } #endif @@ -49998,9 +49998,9 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glDisablei")] public static - void Disable(OpenTK.Graphics.Version30 target, Int32 index) + void Disable(OpenTK.Graphics.IndexedEnableCap target, Int32 index) { - Delegates.glDisablei((OpenTK.Graphics.Version30)target, (UInt32)index); + Delegates.glDisablei((OpenTK.Graphics.IndexedEnableCap)target, (UInt32)index); } @@ -50015,13 +50015,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glIsEnabledi")] public static - bool IsEnabled(OpenTK.Graphics.Version30 target, UInt32 index) + bool IsEnabled(OpenTK.Graphics.IndexedEnableCap target, UInt32 index) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - return Delegates.glIsEnabledi((OpenTK.Graphics.Version30)target, (UInt32)index); + return Delegates.glIsEnabledi((OpenTK.Graphics.IndexedEnableCap)target, (UInt32)index); #if DEBUG } #endif @@ -50038,9 +50038,9 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glIsEnabledi")] public static - bool IsEnabled(OpenTK.Graphics.Version30 target, Int32 index) + bool IsEnabled(OpenTK.Graphics.IndexedEnableCap target, Int32 index) { - return Delegates.glIsEnabledi((OpenTK.Graphics.Version30)target, (UInt32)index); + return Delegates.glIsEnabledi((OpenTK.Graphics.IndexedEnableCap)target, (UInt32)index); } [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBeginTransformFeedback")] @@ -50074,13 +50074,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBindBufferRange")] public static - void BindBufferRange(OpenTK.Graphics.Version30 target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size) + void BindBufferRange(OpenTK.Graphics.BufferTarget target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glBindBufferRange((OpenTK.Graphics.Version30)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); + Delegates.glBindBufferRange((OpenTK.Graphics.BufferTarget)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); #if DEBUG } #endif @@ -50088,21 +50088,21 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBindBufferRange")] public static - void BindBufferRange(OpenTK.Graphics.Version30 target, Int32 index, Int32 buffer, IntPtr offset, IntPtr size) + void BindBufferRange(OpenTK.Graphics.BufferTarget target, Int32 index, Int32 buffer, IntPtr offset, IntPtr size) { - Delegates.glBindBufferRange((OpenTK.Graphics.Version30)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); + Delegates.glBindBufferRange((OpenTK.Graphics.BufferTarget)target, (UInt32)index, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); } [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBindBufferBase")] public static - void BindBufferBase(OpenTK.Graphics.Version30 target, UInt32 index, UInt32 buffer) + void BindBufferBase(OpenTK.Graphics.BufferTarget target, UInt32 index, UInt32 buffer) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glBindBufferBase((OpenTK.Graphics.Version30)target, (UInt32)index, (UInt32)buffer); + Delegates.glBindBufferBase((OpenTK.Graphics.BufferTarget)target, (UInt32)index, (UInt32)buffer); #if DEBUG } #endif @@ -50110,9 +50110,9 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBindBufferBase")] public static - void BindBufferBase(OpenTK.Graphics.Version30 target, Int32 index, Int32 buffer) + void BindBufferBase(OpenTK.Graphics.BufferTarget target, Int32 index, Int32 buffer) { - Delegates.glBindBufferBase((OpenTK.Graphics.Version30)target, (UInt32)index, (UInt32)buffer); + Delegates.glBindBufferBase((OpenTK.Graphics.BufferTarget)target, (UInt32)index, (UInt32)buffer); } [System.CLSCompliant(false)] diff --git a/Source/OpenTK/Graphics/GL/GLCore.cs b/Source/OpenTK/Graphics/GL/GLCore.cs index 78aea191..0382548d 100644 --- a/Source/OpenTK/Graphics/GL/GLCore.cs +++ b/Source/OpenTK/Graphics/GL/GLCore.cs @@ -1789,19 +1789,19 @@ namespace OpenTK.Graphics internal extern static void ColorMaski(UInt32 index, bool r, bool g, bool b, bool a); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetBooleani_v", ExactSpelling = true)] - internal extern static unsafe void GetBooleani_v(OpenTK.Graphics.Version30 target, UInt32 index, [Out] bool* data); + internal extern static unsafe void GetBooleani_v(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] bool* data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetIntegeri_v", ExactSpelling = true)] - internal extern static unsafe void GetIntegeri_v(OpenTK.Graphics.Version30 target, UInt32 index, [Out] Int32* data); + internal extern static unsafe void GetIntegeri_v(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] Int32* data); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEnablei", ExactSpelling = true)] - internal extern static void Enablei(OpenTK.Graphics.Version30 target, UInt32 index); + internal extern static void Enablei(OpenTK.Graphics.IndexedEnableCap target, UInt32 index); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDisablei", ExactSpelling = true)] - internal extern static void Disablei(OpenTK.Graphics.Version30 target, UInt32 index); + internal extern static void Disablei(OpenTK.Graphics.IndexedEnableCap target, UInt32 index); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glIsEnabledi", ExactSpelling = true)] - internal extern static bool IsEnabledi(OpenTK.Graphics.Version30 target, UInt32 index); + internal extern static bool IsEnabledi(OpenTK.Graphics.IndexedEnableCap target, UInt32 index); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginTransformFeedback", ExactSpelling = true)] internal extern static void BeginTransformFeedback(OpenTK.Graphics.Version30 primitiveMode); @@ -1810,10 +1810,10 @@ namespace OpenTK.Graphics internal extern static void EndTransformFeedback(); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBindBufferRange", ExactSpelling = true)] - internal extern static void BindBufferRange(OpenTK.Graphics.Version30 target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size); + internal extern static void BindBufferRange(OpenTK.Graphics.BufferTarget target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBindBufferBase", ExactSpelling = true)] - internal extern static void BindBufferBase(OpenTK.Graphics.Version30 target, UInt32 index, UInt32 buffer); + internal extern static void BindBufferBase(OpenTK.Graphics.BufferTarget target, UInt32 index, UInt32 buffer); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTransformFeedbackVaryings", ExactSpelling = true)] internal extern static void TransformFeedbackVaryings(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.Version30 bufferMode); diff --git a/Source/OpenTK/Graphics/GL/GLDelegates.cs b/Source/OpenTK/Graphics/GL/GLDelegates.cs index 9d54de8f..cd9bba25 100644 --- a/Source/OpenTK/Graphics/GL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/GL/GLDelegates.cs @@ -1790,19 +1790,19 @@ namespace OpenTK.Graphics internal delegate void ColorMaski(UInt32 index, bool r, bool g, bool b, bool a); internal static ColorMaski glColorMaski; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetBooleani_v(OpenTK.Graphics.Version30 target, UInt32 index, [Out] bool* data); + internal unsafe delegate void GetBooleani_v(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] bool* data); internal unsafe static GetBooleani_v glGetBooleani_v; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetIntegeri_v(OpenTK.Graphics.Version30 target, UInt32 index, [Out] Int32* data); + internal unsafe delegate void GetIntegeri_v(OpenTK.Graphics.GetIndexedPName target, UInt32 index, [Out] Int32* data); internal unsafe static GetIntegeri_v glGetIntegeri_v; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void Enablei(OpenTK.Graphics.Version30 target, UInt32 index); + internal delegate void Enablei(OpenTK.Graphics.IndexedEnableCap target, UInt32 index); internal static Enablei glEnablei; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void Disablei(OpenTK.Graphics.Version30 target, UInt32 index); + internal delegate void Disablei(OpenTK.Graphics.IndexedEnableCap target, UInt32 index); internal static Disablei glDisablei; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate bool IsEnabledi(OpenTK.Graphics.Version30 target, UInt32 index); + internal delegate bool IsEnabledi(OpenTK.Graphics.IndexedEnableCap target, UInt32 index); internal static IsEnabledi glIsEnabledi; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void BeginTransformFeedback(OpenTK.Graphics.Version30 primitiveMode); @@ -1811,10 +1811,10 @@ namespace OpenTK.Graphics internal delegate void EndTransformFeedback(); internal static EndTransformFeedback glEndTransformFeedback; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void BindBufferRange(OpenTK.Graphics.Version30 target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size); + internal delegate void BindBufferRange(OpenTK.Graphics.BufferTarget target, UInt32 index, UInt32 buffer, IntPtr offset, IntPtr size); internal static BindBufferRange glBindBufferRange; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void BindBufferBase(OpenTK.Graphics.Version30 target, UInt32 index, UInt32 buffer); + internal delegate void BindBufferBase(OpenTK.Graphics.BufferTarget target, UInt32 index, UInt32 buffer); internal static BindBufferBase glBindBufferBase; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void TransformFeedbackVaryings(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.Version30 bufferMode); diff --git a/Source/OpenTK/Graphics/GL/GLEnums.cs b/Source/OpenTK/Graphics/GL/GLEnums.cs index e45a9d0b..1901f130 100644 --- a/Source/OpenTK/Graphics/GL/GLEnums.cs +++ b/Source/OpenTK/Graphics/GL/GLEnums.cs @@ -1038,6 +1038,16 @@ namespace OpenTK.Graphics ClampVertexColor = ((int)0X891a), ClampFragmentColor = ((int)0X891b), ClampReadColor = ((int)0X891c), + MaxVertexUniformBlocks = ((int)0X8a2b), + MaxGeometryUniformBlocks = ((int)0X8a2c), + MaxFragmentUniformBlocks = ((int)0X8a2D), + MaxCombinedUniformBlocks = ((int)0X8a2e), + MaxUniformBufferBindings = ((int)0X8a2f), + MaxUniformBlockSize = ((int)0X8a30), + MaxCombinedVertexUniformComponents = ((int)0X8a31), + MaxCombinedGeometryUniformComponents = ((int)0X8a32), + MaxCombinedFragmentUniformComponents = ((int)0X8a33), + UniformBufferOffsetAlignment = ((int)0X8a34), MaxFragmentUniformComponents = ((int)0X8b49), MaxVertexUniformComponents = ((int)0X8b4a), MaxVaryingFloats = ((int)0X8b4b), @@ -6677,6 +6687,8 @@ namespace OpenTK.Graphics MaxProgramLocalParameters = ((int)0X88b4), MaxProgramEnvParameters = ((int)0X88b5), ProgramUnderNativeLimits = ((int)0X88b6), + ActiveUniformBlockMaxNameLength = ((int)0X8a35), + ActiveUniformBlocks = ((int)0X8a36), } public enum AssemblyProgramStringParameterArb @@ -9632,6 +9644,7 @@ namespace OpenTK.Graphics ElementArrayBuffer = ((int)0X8893), PixelPackBuffer = ((int)0X88eb), PixelUnpackBuffer = ((int)0X88ec), + UniformBuffer = ((int)0X8a11), CopyReadBuffer = ((int)0X8f36), CopyWriteBuffer = ((int)0X8f37), } @@ -9873,6 +9886,18 @@ namespace OpenTK.Graphics Extensions = ((int)0X1f03), } + public enum IndexedEnableCap + { + Blend = ((int)0X0be2), + } + + public enum GetIndexedPName + { + UniformBufferBinding = ((int)0X8a28), + UniformBufferStart = ((int)0X8a29), + UniformBufferSize = ((int)0X8a2a), + } + public enum BufferParameterApple { BufferSerializedModifyApple = ((int)0X8a12),