From 5a59e63cea838146ecc7af118f722c9be9f17497 Mon Sep 17 00:00:00 2001 From: "Stefanos A." Date: Tue, 22 Oct 2013 18:37:25 +0200 Subject: [PATCH] Implemented strongly-typed Texture functions according to the OpenGL 4.4 specification, section 8. See issue #2. --- .../Bind/Specifications/GL2/gloverrides.xml | 174 ++++++++++++++- Source/OpenTK/Graphics/OpenGL/GL.cs | 45 ++-- Source/OpenTK/Graphics/OpenGL/GLCore.cs | 16 +- Source/OpenTK/Graphics/OpenGL/GLDelegates.cs | 16 +- Source/OpenTK/Graphics/OpenGL/GLEnums.cs | 204 +++++++++++++++++- 5 files changed, 400 insertions(+), 55 deletions(-) diff --git a/Source/Bind/Specifications/GL2/gloverrides.xml b/Source/Bind/Specifications/GL2/gloverrides.xml index 8470bdaf..01859da3 100644 --- a/Source/Bind/Specifications/GL2/gloverrides.xml +++ b/Source/Bind/Specifications/GL2/gloverrides.xml @@ -849,6 +849,15 @@ + + + + TextureAccess + + + SizedInternalFormat + + @@ -862,6 +871,33 @@ + + + TextureTarget1d + + + SizedInternalFormat + + + + + + TextureTarget2d + + + SizedInternalFormat + + + + + + TextureTarget3d + + + SizedInternalFormat + + + @@ -929,6 +965,62 @@ ProgramInterface + + + + TextureBufferTarget + + + SizedInternalFormat + + + + + + TextureTargetMultisample2d + + + SizedInternalFormat + + + + + + TextureTargetMultisample3d + + + SizedInternalFormat + + + + + + TextureTarget + + + PixelInternalFormat + + + + + + + + PixelFormat + + + TextureTarget3d + + + + + + PixelFormat + + + TextureTarget3d + + @@ -1857,6 +1949,7 @@ + @@ -1984,6 +2077,7 @@ + @@ -2480,10 +2574,6 @@ - - - - @@ -2544,13 +2634,46 @@ + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -2957,6 +3080,11 @@ + + + + + @@ -3091,6 +3219,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs index 9874cf89..a000b735 100644 --- a/Source/OpenTK/Graphics/OpenGL/GL.cs +++ b/Source/OpenTK/Graphics/OpenGL/GL.cs @@ -30,6 +30,7 @@ namespace OpenTK.Graphics.OpenGL using System; using System.Text; using System.Runtime.InteropServices; + #pragma warning disable 3006 #pragma warning disable 3019 #pragma warning disable 1591 #pragma warning disable 1572 @@ -33059,13 +33060,13 @@ namespace OpenTK.Graphics.OpenGL /// [requires: v4.2 and ARB_shader_image_load_store] [AutoGenerated(Category = "ARB_shader_image_load_store", Version = "4.2", EntryPoint = "glBindImageTexture")] public static - void BindImageTexture(Int32 unit, Int32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore access, OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore format) + void BindImageTexture(Int32 unit, Int32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.TextureAccess access, OpenTK.Graphics.OpenGL.SizedInternalFormat format) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glBindImageTexture((UInt32)unit, (UInt32)texture, (Int32)level, (bool)layered, (Int32)layer, (OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore)access, (OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore)format); + Delegates.glBindImageTexture((UInt32)unit, (UInt32)texture, (Int32)level, (bool)layered, (Int32)layer, (OpenTK.Graphics.OpenGL.TextureAccess)access, (OpenTK.Graphics.OpenGL.SizedInternalFormat)format); #if DEBUG } #endif @@ -33075,13 +33076,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ARB_shader_image_load_store", Version = "4.2", EntryPoint = "glBindImageTexture")] public static - void BindImageTexture(UInt32 unit, UInt32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore access, OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore format) + void BindImageTexture(UInt32 unit, UInt32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.TextureAccess access, OpenTK.Graphics.OpenGL.SizedInternalFormat format) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glBindImageTexture((UInt32)unit, (UInt32)texture, (Int32)level, (bool)layered, (Int32)layer, (OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore)access, (OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore)format); + Delegates.glBindImageTexture((UInt32)unit, (UInt32)texture, (Int32)level, (bool)layered, (Int32)layer, (OpenTK.Graphics.OpenGL.TextureAccess)access, (OpenTK.Graphics.OpenGL.SizedInternalFormat)format); #if DEBUG } #endif @@ -97892,13 +97893,13 @@ namespace OpenTK.Graphics.OpenGL /// [requires: v4.3 and ARB_texture_buffer_range] [AutoGenerated(Category = "ARB_texture_buffer_range", Version = "4.3", EntryPoint = "glTexBufferRange")] public static - void TexBufferRange(OpenTK.Graphics.OpenGL.ArbTextureBufferRange target, OpenTK.Graphics.OpenGL.ArbTextureBufferRange internalformat, Int32 buffer, IntPtr offset, IntPtr size) + void TexBufferRange(OpenTK.Graphics.OpenGL.TextureBufferTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 buffer, IntPtr offset, IntPtr size) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexBufferRange((OpenTK.Graphics.OpenGL.ArbTextureBufferRange)target, (OpenTK.Graphics.OpenGL.ArbTextureBufferRange)internalformat, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); + Delegates.glTexBufferRange((OpenTK.Graphics.OpenGL.TextureBufferTarget)target, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); #if DEBUG } #endif @@ -97908,13 +97909,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ARB_texture_buffer_range", Version = "4.3", EntryPoint = "glTexBufferRange")] public static - void TexBufferRange(OpenTK.Graphics.OpenGL.ArbTextureBufferRange target, OpenTK.Graphics.OpenGL.ArbTextureBufferRange internalformat, UInt32 buffer, IntPtr offset, IntPtr size) + void TexBufferRange(OpenTK.Graphics.OpenGL.TextureBufferTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, UInt32 buffer, IntPtr offset, IntPtr size) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexBufferRange((OpenTK.Graphics.OpenGL.ArbTextureBufferRange)target, (OpenTK.Graphics.OpenGL.ArbTextureBufferRange)internalformat, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); + Delegates.glTexBufferRange((OpenTK.Graphics.OpenGL.TextureBufferTarget)target, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (UInt32)buffer, (IntPtr)offset, (IntPtr)size); #if DEBUG } #endif @@ -101883,13 +101884,13 @@ namespace OpenTK.Graphics.OpenGL /// [requires: v4.2 and ARB_texture_storage] [AutoGenerated(Category = "ARB_texture_storage", Version = "4.2", EntryPoint = "glTexStorage1D")] public static - void TexStorage1D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width) + void TexStorage1D(OpenTK.Graphics.OpenGL.TextureTarget1d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexStorage1D((OpenTK.Graphics.OpenGL.ArbTextureStorage)target, (Int32)levels, (OpenTK.Graphics.OpenGL.ArbTextureStorage)internalformat, (Int32)width); + Delegates.glTexStorage1D((OpenTK.Graphics.OpenGL.TextureTarget1d)target, (Int32)levels, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (Int32)width); #if DEBUG } #endif @@ -101898,13 +101899,13 @@ namespace OpenTK.Graphics.OpenGL /// [requires: v4.2 and ARB_texture_storage] [AutoGenerated(Category = "ARB_texture_storage", Version = "4.2", EntryPoint = "glTexStorage2D")] public static - void TexStorage2D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width, Int32 height) + void TexStorage2D(OpenTK.Graphics.OpenGL.TextureTarget2d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexStorage2D((OpenTK.Graphics.OpenGL.ArbTextureStorage)target, (Int32)levels, (OpenTK.Graphics.OpenGL.ArbTextureStorage)internalformat, (Int32)width, (Int32)height); + Delegates.glTexStorage2D((OpenTK.Graphics.OpenGL.TextureTarget2d)target, (Int32)levels, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (Int32)width, (Int32)height); #if DEBUG } #endif @@ -101913,13 +101914,13 @@ namespace OpenTK.Graphics.OpenGL /// [requires: v4.3 and ARB_texture_storage_multisample] [AutoGenerated(Category = "ARB_texture_storage_multisample", Version = "4.3", EntryPoint = "glTexStorage2DMultisample")] public static - void TexStorage2DMultisample(OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample internalformat, Int32 width, Int32 height, bool fixedsamplelocations) + void TexStorage2DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample2d target, Int32 samples, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, bool fixedsamplelocations) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexStorage2DMultisample((OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample)target, (Int32)samples, (OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample)internalformat, (Int32)width, (Int32)height, (bool)fixedsamplelocations); + Delegates.glTexStorage2DMultisample((OpenTK.Graphics.OpenGL.TextureTargetMultisample2d)target, (Int32)samples, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (Int32)width, (Int32)height, (bool)fixedsamplelocations); #if DEBUG } #endif @@ -101928,13 +101929,13 @@ namespace OpenTK.Graphics.OpenGL /// [requires: v4.2 and ARB_texture_storage] [AutoGenerated(Category = "ARB_texture_storage", Version = "4.2", EntryPoint = "glTexStorage3D")] public static - void TexStorage3D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width, Int32 height, Int32 depth) + void TexStorage3D(OpenTK.Graphics.OpenGL.TextureTarget3d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexStorage3D((OpenTK.Graphics.OpenGL.ArbTextureStorage)target, (Int32)levels, (OpenTK.Graphics.OpenGL.ArbTextureStorage)internalformat, (Int32)width, (Int32)height, (Int32)depth); + Delegates.glTexStorage3D((OpenTK.Graphics.OpenGL.TextureTarget3d)target, (Int32)levels, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth); #if DEBUG } #endif @@ -101943,13 +101944,13 @@ namespace OpenTK.Graphics.OpenGL /// [requires: v4.3 and ARB_texture_storage_multisample] [AutoGenerated(Category = "ARB_texture_storage_multisample", Version = "4.3", EntryPoint = "glTexStorage3DMultisample")] public static - void TexStorage3DMultisample(OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations) + void TexStorage3DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample3d target, Int32 samples, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexStorage3DMultisample((OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample)target, (Int32)samples, (OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample)internalformat, (Int32)width, (Int32)height, (Int32)depth, (bool)fixedsamplelocations); + Delegates.glTexStorage3DMultisample((OpenTK.Graphics.OpenGL.TextureTargetMultisample3d)target, (Int32)samples, (OpenTK.Graphics.OpenGL.SizedInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (bool)fixedsamplelocations); #if DEBUG } #endif @@ -103014,13 +103015,13 @@ namespace OpenTK.Graphics.OpenGL /// [requires: v4.3 and ARB_texture_view] [AutoGenerated(Category = "ARB_texture_view", Version = "4.3", EntryPoint = "glTextureView")] public static - void TextureView(Int32 texture, OpenTK.Graphics.OpenGL.ArbTextureView target, Int32 origtexture, OpenTK.Graphics.OpenGL.ArbTextureView internalformat, Int32 minlevel, Int32 numlevels, Int32 minlayer, Int32 numlayers) + void TextureView(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 origtexture, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 minlevel, Int32 numlevels, Int32 minlayer, Int32 numlayers) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTextureView((UInt32)texture, (OpenTK.Graphics.OpenGL.ArbTextureView)target, (UInt32)origtexture, (OpenTK.Graphics.OpenGL.ArbTextureView)internalformat, (UInt32)minlevel, (UInt32)numlevels, (UInt32)minlayer, (UInt32)numlayers); + Delegates.glTextureView((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (UInt32)origtexture, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (UInt32)minlevel, (UInt32)numlevels, (UInt32)minlayer, (UInt32)numlayers); #if DEBUG } #endif @@ -103030,13 +103031,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ARB_texture_view", Version = "4.3", EntryPoint = "glTextureView")] public static - void TextureView(UInt32 texture, OpenTK.Graphics.OpenGL.ArbTextureView target, UInt32 origtexture, OpenTK.Graphics.OpenGL.ArbTextureView internalformat, UInt32 minlevel, UInt32 numlevels, UInt32 minlayer, UInt32 numlayers) + void TextureView(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, UInt32 origtexture, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, UInt32 minlevel, UInt32 numlevels, UInt32 minlayer, UInt32 numlayers) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTextureView((UInt32)texture, (OpenTK.Graphics.OpenGL.ArbTextureView)target, (UInt32)origtexture, (OpenTK.Graphics.OpenGL.ArbTextureView)internalformat, (UInt32)minlevel, (UInt32)numlevels, (UInt32)minlayer, (UInt32)numlayers); + Delegates.glTextureView((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (UInt32)origtexture, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (UInt32)minlevel, (UInt32)numlevels, (UInt32)minlayer, (UInt32)numlayers); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs index 75621bb1..304f9f70 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs @@ -209,7 +209,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static void BindFramebufferEXT(OpenTK.Graphics.OpenGL.FramebufferTarget target, UInt32 framebuffer); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBindImageTexture", ExactSpelling = true)] - internal extern static void BindImageTexture(UInt32 unit, UInt32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore access, OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore format); + internal extern static void BindImageTexture(UInt32 unit, UInt32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.TextureAccess access, OpenTK.Graphics.OpenGL.SizedInternalFormat format); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBindImageTextureEXT", ExactSpelling = true)] internal extern static void BindImageTextureEXT(UInt32 index, UInt32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.ExtShaderImageLoadStore access, Int32 format); @@ -5582,7 +5582,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static void TexBufferEXT(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.ExtTextureBufferObject internalformat, UInt32 buffer); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexBufferRange", ExactSpelling = true)] - internal extern static void TexBufferRange(OpenTK.Graphics.OpenGL.ArbTextureBufferRange target, OpenTK.Graphics.OpenGL.ArbTextureBufferRange internalformat, UInt32 buffer, IntPtr offset, IntPtr size); + internal extern static void TexBufferRange(OpenTK.Graphics.OpenGL.TextureBufferTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, UInt32 buffer, IntPtr offset, IntPtr size); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexBumpParameterfvATI", ExactSpelling = true)] internal extern static unsafe void TexBumpParameterfvATI(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, Single* param); @@ -5945,19 +5945,19 @@ namespace OpenTK.Graphics.OpenGL internal extern static void TexRenderbufferNV(OpenTK.Graphics.OpenGL.TextureTarget target, UInt32 renderbuffer); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexStorage1D", ExactSpelling = true)] - internal extern static void TexStorage1D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width); + internal extern static void TexStorage1D(OpenTK.Graphics.OpenGL.TextureTarget1d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexStorage2D", ExactSpelling = true)] - internal extern static void TexStorage2D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width, Int32 height); + internal extern static void TexStorage2D(OpenTK.Graphics.OpenGL.TextureTarget2d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexStorage2DMultisample", ExactSpelling = true)] - internal extern static void TexStorage2DMultisample(OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample internalformat, Int32 width, Int32 height, bool fixedsamplelocations); + internal extern static void TexStorage2DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample2d target, Int32 samples, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, bool fixedsamplelocations); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexStorage3D", ExactSpelling = true)] - internal extern static void TexStorage3D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width, Int32 height, Int32 depth); + internal extern static void TexStorage3D(OpenTK.Graphics.OpenGL.TextureTarget3d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexStorage3DMultisample", ExactSpelling = true)] - internal extern static void TexStorage3DMultisample(OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations); + internal extern static void TexStorage3DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample3d target, Int32 samples, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexStorageSparseAMD", ExactSpelling = true)] internal extern static void TexStorageSparseAMD(OpenTK.Graphics.OpenGL.AmdSparseTexture target, OpenTK.Graphics.OpenGL.AmdSparseTexture internalFormat, Int32 width, Int32 height, Int32 depth, Int32 layers, UInt32 flags); @@ -6077,7 +6077,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static void TextureSubImage3DEXT(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTextureView", ExactSpelling = true)] - internal extern static void TextureView(UInt32 texture, OpenTK.Graphics.OpenGL.ArbTextureView target, UInt32 origtexture, OpenTK.Graphics.OpenGL.ArbTextureView internalformat, UInt32 minlevel, UInt32 numlevels, UInt32 minlayer, UInt32 numlayers); + internal extern static void TextureView(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, UInt32 origtexture, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, UInt32 minlevel, UInt32 numlevels, UInt32 minlayer, UInt32 numlayers); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTrackMatrixNV", ExactSpelling = true)] internal extern static void TrackMatrixNV(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 address, OpenTK.Graphics.OpenGL.NvVertexProgram matrix, OpenTK.Graphics.OpenGL.NvVertexProgram transform); diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs index c69e12a8..34c8202d 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs @@ -207,7 +207,7 @@ namespace OpenTK.Graphics.OpenGL internal delegate void BindFramebufferEXT(OpenTK.Graphics.OpenGL.FramebufferTarget target, UInt32 framebuffer); internal static BindFramebufferEXT glBindFramebufferEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void BindImageTexture(UInt32 unit, UInt32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore access, OpenTK.Graphics.OpenGL.ArbShaderImageLoadStore format); + internal delegate void BindImageTexture(UInt32 unit, UInt32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.TextureAccess access, OpenTK.Graphics.OpenGL.SizedInternalFormat format); internal static BindImageTexture glBindImageTexture; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void BindImageTextureEXT(UInt32 index, UInt32 texture, Int32 level, bool layered, Int32 layer, OpenTK.Graphics.OpenGL.ExtShaderImageLoadStore access, Int32 format); @@ -5580,7 +5580,7 @@ namespace OpenTK.Graphics.OpenGL internal delegate void TexBufferEXT(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.ExtTextureBufferObject internalformat, UInt32 buffer); internal static TexBufferEXT glTexBufferEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexBufferRange(OpenTK.Graphics.OpenGL.ArbTextureBufferRange target, OpenTK.Graphics.OpenGL.ArbTextureBufferRange internalformat, UInt32 buffer, IntPtr offset, IntPtr size); + internal delegate void TexBufferRange(OpenTK.Graphics.OpenGL.TextureBufferTarget target, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, UInt32 buffer, IntPtr offset, IntPtr size); internal static TexBufferRange glTexBufferRange; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void TexBumpParameterfvATI(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, Single* param); @@ -5943,19 +5943,19 @@ namespace OpenTK.Graphics.OpenGL internal delegate void TexRenderbufferNV(OpenTK.Graphics.OpenGL.TextureTarget target, UInt32 renderbuffer); internal static TexRenderbufferNV glTexRenderbufferNV; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexStorage1D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width); + internal delegate void TexStorage1D(OpenTK.Graphics.OpenGL.TextureTarget1d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width); internal static TexStorage1D glTexStorage1D; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexStorage2D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width, Int32 height); + internal delegate void TexStorage2D(OpenTK.Graphics.OpenGL.TextureTarget2d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height); internal static TexStorage2D glTexStorage2D; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexStorage2DMultisample(OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample internalformat, Int32 width, Int32 height, bool fixedsamplelocations); + internal delegate void TexStorage2DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample2d target, Int32 samples, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, bool fixedsamplelocations); internal static TexStorage2DMultisample glTexStorage2DMultisample; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexStorage3D(OpenTK.Graphics.OpenGL.ArbTextureStorage target, Int32 levels, OpenTK.Graphics.OpenGL.ArbTextureStorage internalformat, Int32 width, Int32 height, Int32 depth); + internal delegate void TexStorage3D(OpenTK.Graphics.OpenGL.TextureTarget3d target, Int32 levels, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth); internal static TexStorage3D glTexStorage3D; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexStorage3DMultisample(OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.ArbTextureStorageMultisample internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations); + internal delegate void TexStorage3DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample3d target, Int32 samples, OpenTK.Graphics.OpenGL.SizedInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations); internal static TexStorage3DMultisample glTexStorage3DMultisample; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void TexStorageSparseAMD(OpenTK.Graphics.OpenGL.AmdSparseTexture target, OpenTK.Graphics.OpenGL.AmdSparseTexture internalFormat, Int32 width, Int32 height, Int32 depth, Int32 layers, UInt32 flags); @@ -6075,7 +6075,7 @@ namespace OpenTK.Graphics.OpenGL internal delegate void TextureSubImage3DEXT(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); internal static TextureSubImage3DEXT glTextureSubImage3DEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TextureView(UInt32 texture, OpenTK.Graphics.OpenGL.ArbTextureView target, UInt32 origtexture, OpenTK.Graphics.OpenGL.ArbTextureView internalformat, UInt32 minlevel, UInt32 numlevels, UInt32 minlayer, UInt32 numlayers); + internal delegate void TextureView(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, UInt32 origtexture, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, UInt32 minlevel, UInt32 numlevels, UInt32 minlayer, UInt32 numlayers); internal static TextureView glTextureView; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void TrackMatrixNV(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 address, OpenTK.Graphics.OpenGL.NvVertexProgram matrix, OpenTK.Graphics.OpenGL.NvVertexProgram transform); diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs index ee620e1b..fbd4e0cb 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs @@ -24506,7 +24506,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.BindImageTexture + /// Not used directly. /// public enum ArbShaderImageLoadStore : int { @@ -25430,7 +25430,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.TexBufferRange, GL.Ext.TextureBufferRange + /// Used in GL.Ext.TextureBufferRange /// public enum ArbTextureBufferRange : int { @@ -26146,7 +26146,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.TexStorage1D, GL.TexStorage2D, GL.TexStorage3D, GL.Ext.TextureStorage1D, GL.Ext.TextureStorage2D, GL.Ext.TextureStorage3D + /// Used in GL.Ext.TextureStorage1D, GL.Ext.TextureStorage2D, GL.Ext.TextureStorage3D /// public enum ArbTextureStorage : int { @@ -26157,7 +26157,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.TexStorage2DMultisample, GL.TexStorage3DMultisample, GL.Ext.TextureStorage2DMultisample, GL.Ext.TextureStorage3DMultisample + /// Used in GL.Ext.TextureStorage2DMultisample, GL.Ext.TextureStorage3DMultisample /// public enum ArbTextureStorageMultisample : int { @@ -26191,7 +26191,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.TextureView + /// Not used directly. /// public enum ArbTextureView : int { @@ -35781,6 +35781,10 @@ namespace OpenTK.Graphics.OpenGL /// Texture2DArray = ((int)0x8C1A) , /// + /// Original was GL_TEXTURE_CUBE_MAP_ARRAY = 0x9009 + /// + TextureCubeMapArray = ((int)0x9009) , + /// /// Original was GL_TEXTURE_2D_MULTISAMPLE = 0x9100 /// Texture2DMultisample = ((int)0x9100) , @@ -46735,7 +46739,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.Arb.CompressedTexImage1D, GL.Arb.CompressedTexImage2D, GL.Arb.CompressedTexImage3D, GL.ClearBufferData, GL.ClearBufferSubData, GL.ColorTable, GL.CompressedTexImage1D, GL.CompressedTexImage2D, GL.CompressedTexImage3D, GL.ConvolutionFilter1D, GL.ConvolutionFilter2D, GL.CopyColorTable, GL.CopyConvolutionFilter1D, GL.CopyConvolutionFilter2D, GL.CopyTexImage1D, GL.CopyTexImage2D, GL.Histogram, GL.Minmax, GL.SeparableFilter2D, GL.TexImage1D, GL.TexImage2D, GL.TexImage2DMultisample, GL.TexImage3D, GL.TexImage3DMultisample, GL.Ext.ColorTable, GL.Ext.ConvolutionFilter1D, GL.Ext.ConvolutionFilter2D, GL.Ext.CopyConvolutionFilter1D, GL.Ext.CopyConvolutionFilter2D, GL.Ext.CopyTexImage1D, GL.Ext.CopyTexImage2D, GL.Ext.Histogram, GL.Ext.Minmax, GL.Ext.NamedRenderbufferStorage, GL.Ext.NamedRenderbufferStorageMultisampleCoverage, GL.Ext.NamedRenderbufferStorageMultisample, GL.Ext.SeparableFilter2D, GL.Ext.TexImage3D, GL.NV.RenderbufferStorageMultisampleCoverage, GL.Sgi.ColorTable, GL.Sgi.CopyColorTable, GL.Sgis.TexImage4D + /// Used in GL.Arb.CompressedTexImage1D, GL.Arb.CompressedTexImage2D, GL.Arb.CompressedTexImage3D, GL.ClearBufferData, GL.ClearBufferSubData, GL.ColorTable, GL.CompressedTexImage1D, GL.CompressedTexImage2D, GL.CompressedTexImage3D, GL.ConvolutionFilter1D, GL.ConvolutionFilter2D, GL.CopyColorTable, GL.CopyConvolutionFilter1D, GL.CopyConvolutionFilter2D, GL.CopyTexImage1D, GL.CopyTexImage2D, GL.Histogram, GL.Minmax, GL.SeparableFilter2D, GL.TexImage1D, GL.TexImage2D, GL.TexImage2DMultisample, GL.TexImage3D, GL.TexImage3DMultisample, GL.TextureView, GL.Ext.ColorTable, GL.Ext.ConvolutionFilter1D, GL.Ext.ConvolutionFilter2D, GL.Ext.CopyConvolutionFilter1D, GL.Ext.CopyConvolutionFilter2D, GL.Ext.CopyTexImage1D, GL.Ext.CopyTexImage2D, GL.Ext.Histogram, GL.Ext.Minmax, GL.Ext.NamedRenderbufferStorage, GL.Ext.NamedRenderbufferStorageMultisampleCoverage, GL.Ext.NamedRenderbufferStorageMultisample, GL.Ext.SeparableFilter2D, GL.Ext.TexImage3D, GL.NV.RenderbufferStorageMultisampleCoverage, GL.Sgi.ColorTable, GL.Sgi.CopyColorTable, GL.Sgis.TexImage4D /// public enum PixelInternalFormat : int { @@ -47352,6 +47356,22 @@ namespace OpenTK.Graphics.OpenGL /// CompressedSignedRgRgtc2 = ((int)0x8DBE) , /// + /// Original was GL_R8_SNORM = 0x8F94 + /// + R8Snorm = ((int)0x8F94) , + /// + /// Original was GL_RG8_SNORM = 0x8F95 + /// + Rg8Snorm = ((int)0x8F95) , + /// + /// Original was GL_RGB8_SNORM = 0x8F96 + /// + Rgb8Snorm = ((int)0x8F96) , + /// + /// Original was GL_RGBA8_SNORM = 0x8F97 + /// + Rgba8Snorm = ((int)0x8F97) , + /// /// Original was GL_RGB10_A2UI = 0x906F /// Rgb10A2ui = ((int)0x906F) , @@ -47561,6 +47581,38 @@ namespace OpenTK.Graphics.OpenGL /// Original was GL_UNPACK_SUBSAMPLE_RATE_SGIX = 0x85A1 /// UnpackSubsampleRateSgix = ((int)0x85A1) , + /// + /// Original was GL_UNPACK_COMPRESSED_BLOCK_WIDTH = 0x9127 + /// + UnpackCompressedBlockWidth = ((int)0x9127) , + /// + /// Original was GL_UNPACK_COMPRESSED_BLOCK_HEIGHT = 0x9128 + /// + UnpackCompressedBlockHeight = ((int)0x9128) , + /// + /// Original was GL_UNPACK_COMPRESSED_BLOCK_DEPTH = 0x9129 + /// + UnpackCompressedBlockDepth = ((int)0x9129) , + /// + /// Original was GL_UNPACK_COMPRESSED_BLOCK_SIZE = 0x912A + /// + UnpackCompressedBlockSize = ((int)0x912A) , + /// + /// Original was GL_PACK_COMPRESSED_BLOCK_WIDTH = 0x912B + /// + PackCompressedBlockWidth = ((int)0x912B) , + /// + /// Original was GL_PACK_COMPRESSED_BLOCK_HEIGHT = 0x912C + /// + PackCompressedBlockHeight = ((int)0x912C) , + /// + /// Original was GL_PACK_COMPRESSED_BLOCK_DEPTH = 0x912D + /// + PackCompressedBlockDepth = ((int)0x912D) , + /// + /// Original was GL_PACK_COMPRESSED_BLOCK_SIZE = 0x912E + /// + PackCompressedBlockSize = ((int)0x912E) , } /// @@ -50992,7 +51044,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.TexBuffer + /// Used in GL.BindImageTexture, GL.TexBuffer, GL.TexBufferRange, GL.TexStorage1D, GL.TexStorage2D, GL.TexStorage2DMultisample, GL.TexStorage3D, GL.TexStorage3DMultisample /// public enum SizedInternalFormat : int { @@ -51540,7 +51592,26 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.TexBuffer + /// Used in GL.BindImageTexture + /// + public enum TextureAccess : int + { + /// + /// Original was GL_READ_ONLY = 0x88B8 + /// + ReadOnly = ((int)0x88B8) , + /// + /// Original was GL_WRITE_ONLY = 0x88B9 + /// + WriteOnly = ((int)0x88B9) , + /// + /// Original was GL_READ_WRITE = 0x88BA + /// + ReadWrite = ((int)0x88BA) , + } + + /// + /// Used in GL.TexBuffer, GL.TexBufferRange /// public enum TextureBufferTarget : int { @@ -52410,7 +52481,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.Arb.CompressedTexImage1D, GL.Arb.CompressedTexImage2D, GL.Arb.CompressedTexImage3D, GL.Arb.CompressedTexSubImage1D, GL.Arb.CompressedTexSubImage2D, GL.Arb.CompressedTexSubImage3D, GL.Arb.FramebufferTextureFace, GL.Arb.GetCompressedTexImage, GL.Arb.TexBuffer, GL.BindTexture, GL.CompressedTexImage1D, GL.CompressedTexImage2D, GL.CompressedTexImage3D, GL.CompressedTexSubImage1D, GL.CompressedTexSubImage2D, GL.CompressedTexSubImage3D, GL.CopyTexImage1D, GL.CopyTexImage2D, GL.CopyTexSubImage1D, GL.CopyTexSubImage2D, GL.CopyTexSubImage3D, GL.FramebufferTexture1D, GL.FramebufferTexture2D, GL.FramebufferTexture3D, GL.GetCompressedTexImage, GL.GetTexImage, GL.GetTexLevelParameter, GL.GetTexParameter, GL.GetTexParameterI, GL.TexImage1D, GL.TexImage2D, GL.TexImage3D, GL.TexParameter, GL.TexParameterI, GL.TexSubImage1D, GL.TexSubImage2D, GL.TexSubImage3D, GL.Ext.BindMultiTexture, GL.Ext.BindTexture, GL.Ext.CompressedMultiTexImage1D, GL.Ext.CompressedMultiTexImage2D, GL.Ext.CompressedMultiTexImage3D, GL.Ext.CompressedMultiTexSubImage1D, GL.Ext.CompressedMultiTexSubImage2D, GL.Ext.CompressedMultiTexSubImage3D, GL.Ext.CompressedTextureImage1D, GL.Ext.CompressedTextureImage2D, GL.Ext.CompressedTextureImage3D, GL.Ext.CompressedTextureSubImage1D, GL.Ext.CompressedTextureSubImage2D, GL.Ext.CompressedTextureSubImage3D, GL.Ext.CopyMultiTexImage1D, GL.Ext.CopyMultiTexImage2D, GL.Ext.CopyMultiTexSubImage1D, GL.Ext.CopyMultiTexSubImage2D, GL.Ext.CopyMultiTexSubImage3D, GL.Ext.CopyTexImage1D, GL.Ext.CopyTexImage2D, GL.Ext.CopyTexSubImage1D, GL.Ext.CopyTexSubImage2D, GL.Ext.CopyTexSubImage3D, GL.Ext.CopyTextureImage1D, GL.Ext.CopyTextureImage2D, GL.Ext.CopyTextureSubImage1D, GL.Ext.CopyTextureSubImage2D, GL.Ext.CopyTextureSubImage3D, GL.Ext.FramebufferTexture1D, GL.Ext.FramebufferTexture2D, GL.Ext.FramebufferTexture3D, GL.Ext.FramebufferTextureFace, GL.Ext.GenerateMultiTexMipmap, GL.Ext.GenerateTextureMipmap, GL.Ext.GetCompressedMultiTexImage, GL.Ext.GetCompressedTextureImage, GL.Ext.GetMultiTexImage, GL.Ext.GetMultiTexLevelParameter, GL.Ext.GetMultiTexParameter, GL.Ext.GetMultiTexParameterI, GL.Ext.GetTexParameterI, GL.Ext.GetTextureImage, GL.Ext.GetTextureLevelParameter, GL.Ext.GetTextureParameter, GL.Ext.GetTextureParameterI, GL.Ext.MultiTexBuffer, GL.Ext.MultiTexImage1D, GL.Ext.MultiTexImage2D, GL.Ext.MultiTexImage3D, GL.Ext.MultiTexParameter, GL.Ext.MultiTexParameterI, GL.Ext.MultiTexRenderbuffer, GL.Ext.MultiTexSubImage1D, GL.Ext.MultiTexSubImage2D, GL.Ext.MultiTexSubImage3D, GL.Ext.NamedFramebufferTexture1D, GL.Ext.NamedFramebufferTexture2D, GL.Ext.NamedFramebufferTexture3D, GL.Ext.NamedFramebufferTextureFace, GL.Ext.TexBuffer, GL.Ext.TexImage3D, GL.Ext.TexParameterI, GL.Ext.TexSubImage1D, GL.Ext.TexSubImage2D, GL.Ext.TexSubImage3D, GL.Ext.TextureBuffer, GL.Ext.TextureImage1D, GL.Ext.TextureImage2D, GL.Ext.TextureImage3D, GL.Ext.TextureParameter, GL.Ext.TextureParameterI, GL.Ext.TextureRenderbuffer, GL.Ext.TextureSubImage1D, GL.Ext.TextureSubImage2D, GL.Ext.TextureSubImage3D, GL.NV.TexRenderbuffer, GL.Sgis.DetailTexFunc, GL.Sgis.GetDetailTexFunc, GL.Sgis.GetSharpenTexFunc, GL.Sgis.GetTexFilterFunc, GL.Sgis.SharpenTexFunc, GL.Sgis.TexFilterFunc, GL.Sgis.TexImage4D, GL.Sgis.TexSubImage4D + /// Used in GL.Arb.CompressedTexImage1D, GL.Arb.CompressedTexImage2D, GL.Arb.CompressedTexImage3D, GL.Arb.CompressedTexSubImage1D, GL.Arb.CompressedTexSubImage2D, GL.Arb.CompressedTexSubImage3D, GL.Arb.FramebufferTextureFace, GL.Arb.GetCompressedTexImage, GL.Arb.TexBuffer, GL.BindTexture, GL.CompressedTexImage1D, GL.CompressedTexImage2D, GL.CompressedTexImage3D, GL.CompressedTexSubImage1D, GL.CompressedTexSubImage2D, GL.CompressedTexSubImage3D, GL.CopyTexImage1D, GL.CopyTexImage2D, GL.CopyTexSubImage1D, GL.CopyTexSubImage2D, GL.CopyTexSubImage3D, GL.FramebufferTexture1D, GL.FramebufferTexture2D, GL.FramebufferTexture3D, GL.GetCompressedTexImage, GL.GetTexImage, GL.GetTexLevelParameter, GL.GetTexParameter, GL.GetTexParameterI, GL.TexImage1D, GL.TexImage2D, GL.TexImage3D, GL.TexParameter, GL.TexParameterI, GL.TexSubImage1D, GL.TexSubImage2D, GL.TexSubImage3D, GL.TextureView, GL.Ext.BindMultiTexture, GL.Ext.BindTexture, GL.Ext.CompressedMultiTexImage1D, GL.Ext.CompressedMultiTexImage2D, GL.Ext.CompressedMultiTexImage3D, GL.Ext.CompressedMultiTexSubImage1D, GL.Ext.CompressedMultiTexSubImage2D, GL.Ext.CompressedMultiTexSubImage3D, GL.Ext.CompressedTextureImage1D, GL.Ext.CompressedTextureImage2D, GL.Ext.CompressedTextureImage3D, GL.Ext.CompressedTextureSubImage1D, GL.Ext.CompressedTextureSubImage2D, GL.Ext.CompressedTextureSubImage3D, GL.Ext.CopyMultiTexImage1D, GL.Ext.CopyMultiTexImage2D, GL.Ext.CopyMultiTexSubImage1D, GL.Ext.CopyMultiTexSubImage2D, GL.Ext.CopyMultiTexSubImage3D, GL.Ext.CopyTexImage1D, GL.Ext.CopyTexImage2D, GL.Ext.CopyTexSubImage1D, GL.Ext.CopyTexSubImage2D, GL.Ext.CopyTexSubImage3D, GL.Ext.CopyTextureImage1D, GL.Ext.CopyTextureImage2D, GL.Ext.CopyTextureSubImage1D, GL.Ext.CopyTextureSubImage2D, GL.Ext.CopyTextureSubImage3D, GL.Ext.FramebufferTexture1D, GL.Ext.FramebufferTexture2D, GL.Ext.FramebufferTexture3D, GL.Ext.FramebufferTextureFace, GL.Ext.GenerateMultiTexMipmap, GL.Ext.GenerateTextureMipmap, GL.Ext.GetCompressedMultiTexImage, GL.Ext.GetCompressedTextureImage, GL.Ext.GetMultiTexImage, GL.Ext.GetMultiTexLevelParameter, GL.Ext.GetMultiTexParameter, GL.Ext.GetMultiTexParameterI, GL.Ext.GetTexParameterI, GL.Ext.GetTextureImage, GL.Ext.GetTextureLevelParameter, GL.Ext.GetTextureParameter, GL.Ext.GetTextureParameterI, GL.Ext.MultiTexBuffer, GL.Ext.MultiTexImage1D, GL.Ext.MultiTexImage2D, GL.Ext.MultiTexImage3D, GL.Ext.MultiTexParameter, GL.Ext.MultiTexParameterI, GL.Ext.MultiTexRenderbuffer, GL.Ext.MultiTexSubImage1D, GL.Ext.MultiTexSubImage2D, GL.Ext.MultiTexSubImage3D, GL.Ext.NamedFramebufferTexture1D, GL.Ext.NamedFramebufferTexture2D, GL.Ext.NamedFramebufferTexture3D, GL.Ext.NamedFramebufferTextureFace, GL.Ext.TexBuffer, GL.Ext.TexImage3D, GL.Ext.TexParameterI, GL.Ext.TexSubImage1D, GL.Ext.TexSubImage2D, GL.Ext.TexSubImage3D, GL.Ext.TextureBuffer, GL.Ext.TextureImage1D, GL.Ext.TextureImage2D, GL.Ext.TextureImage3D, GL.Ext.TextureParameter, GL.Ext.TextureParameterI, GL.Ext.TextureRenderbuffer, GL.Ext.TextureSubImage1D, GL.Ext.TextureSubImage2D, GL.Ext.TextureSubImage3D, GL.NV.TexRenderbuffer, GL.Sgis.DetailTexFunc, GL.Sgis.GetDetailTexFunc, GL.Sgis.GetSharpenTexFunc, GL.Sgis.GetTexFilterFunc, GL.Sgis.SharpenTexFunc, GL.Sgis.TexFilterFunc, GL.Sgis.TexImage4D, GL.Sgis.TexSubImage4D /// public enum TextureTarget : int { @@ -52572,6 +52643,91 @@ namespace OpenTK.Graphics.OpenGL ProxyTexture2DMultisampleArray = ((int)0x9103) , } + /// + /// Used in GL.TexStorage1D + /// + public enum TextureTarget1d : int + { + /// + /// Original was GL_TEXTURE_1D = 0x0DE0 + /// + Texture1D = ((int)0x0DE0) , + /// + /// Original was GL_PROXY_TEXTURE_1D = 0x8063 + /// + ProxyTexture1D = ((int)0x8063) , + } + + /// + /// Used in GL.TexStorage2D + /// + public enum TextureTarget2d : int + { + /// + /// Original was GL_TEXTURE_2D = 0x0DE1 + /// + Texture2D = ((int)0x0DE1) , + /// + /// Original was GL_PROXY_TEXTURE_2D = 0x8064 + /// + ProxyTexture2D = ((int)0x8064) , + /// + /// Original was GL_TEXTURE_RECTANGLE = 0x84F5 + /// + TextureRectangle = ((int)0x84F5) , + /// + /// Original was GL_PROXY_TEXTURE_RECTANGLE = 0x84F7 + /// + ProxyTextureRectangle = ((int)0x84F7) , + /// + /// Original was GL_TEXTURE_CUBE_MAP = 0x8513 + /// + TextureCubeMap = ((int)0x8513) , + /// + /// Original was GL_PROXY_TEXTURE_CUBE_MAP = 0x851B + /// + ProxyTextureCubeMap = ((int)0x851B) , + /// + /// Original was GL_TEXTURE_1D_ARRAY = 0x8C18 + /// + Texture1DArray = ((int)0x8C18) , + /// + /// Original was GL_PROXY_TEXTURE_1D_ARRAY = 0x8C19 + /// + ProxyTexture1DArray = ((int)0x8C19) , + } + + /// + /// Used in GL.TexStorage3D + /// + public enum TextureTarget3d : int + { + /// + /// Original was GL_TEXTURE_3D = 0x806F + /// + Texture3D = ((int)0x806F) , + /// + /// Original was GL_PROXY_TEXTURE_3D = 0x8070 + /// + ProxyTexture3D = ((int)0x8070) , + /// + /// Original was GL_TEXTURE_CUBE_MAP = 0x8513 + /// + TextureCubeMap = ((int)0x8513) , + /// + /// Original was GL_PROXY_TEXTURE_CUBE_MAP = 0x851B + /// + ProxyTextureCubeMap = ((int)0x851B) , + /// + /// Original was GL_TEXTURE_2D_ARRAY = 0x8C1A + /// + Texture2DArray = ((int)0x8C1A) , + /// + /// Original was GL_PROXY_TEXTURE_2D_ARRAY = 0x8C1B + /// + ProxyTexture2DArray = ((int)0x8C1B) , + } + /// /// Used in GL.TexImage2DMultisample, GL.TexImage3DMultisample /// @@ -52595,6 +52751,36 @@ namespace OpenTK.Graphics.OpenGL ProxyTexture2DMultisampleArray = ((int)0x9103) , } + /// + /// Used in GL.TexStorage2DMultisample + /// + public enum TextureTargetMultisample2d : int + { + /// + /// Original was GL_TEXTURE_2D_MULTISAMPLE = 0x9100 + /// + Texture2DMultisample = ((int)0x9100) , + /// + /// Original was GL_PROXY_TEXTURE_2D_MULTISAMPLE = 0x9101 + /// + ProxyTexture2DMultisample = ((int)0x9101) , + } + + /// + /// Used in GL.TexStorage3DMultisample + /// + public enum TextureTargetMultisample3d : int + { + /// + /// Original was GL_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102 + /// + Texture2DMultisampleArray = ((int)0x9102) , + /// + /// Original was GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9103 + /// + ProxyTexture2DMultisampleArray = ((int)0x9103) , + } + /// /// Used in GL.Arb.ActiveTexture, GL.Arb.ClientActiveTexture, GL.Arb.MultiTexCoord1, GL.Arb.MultiTexCoord2, GL.Arb.MultiTexCoord3, GL.Arb.MultiTexCoord4, GL.ActiveTexture, GL.ClientActiveTexture, GL.MultiTexCoord1, GL.MultiTexCoord2, GL.MultiTexCoord3, GL.MultiTexCoord4, GL.MultiTexCoordP1, GL.MultiTexCoordP2, GL.MultiTexCoordP3, GL.MultiTexCoordP4, GL.Ext.BindMultiTexture, GL.Ext.BindTexGenParameter, GL.Ext.BindTextureUnitParameter, GL.Ext.CompressedMultiTexImage1D, GL.Ext.CompressedMultiTexImage2D, GL.Ext.CompressedMultiTexImage3D, GL.Ext.CompressedMultiTexSubImage1D, GL.Ext.CompressedMultiTexSubImage2D, GL.Ext.CompressedMultiTexSubImage3D, GL.Ext.CopyMultiTexImage1D, GL.Ext.CopyMultiTexImage2D, GL.Ext.CopyMultiTexSubImage1D, GL.Ext.CopyMultiTexSubImage2D, GL.Ext.CopyMultiTexSubImage3D, GL.Ext.GenerateMultiTexMipmap, GL.Ext.GetCompressedMultiTexImage, GL.Ext.GetMultiTexEnv, GL.Ext.GetMultiTexGen, GL.Ext.GetMultiTexImage, GL.Ext.GetMultiTexLevelParameter, GL.Ext.GetMultiTexParameter, GL.Ext.GetMultiTexParameterI, GL.Ext.MultiTexBuffer, GL.Ext.MultiTexCoordPointer, GL.Ext.MultiTexEnv, GL.Ext.MultiTexGend, GL.Ext.MultiTexGen, GL.Ext.MultiTexImage1D, GL.Ext.MultiTexImage2D, GL.Ext.MultiTexImage3D, GL.Ext.MultiTexParameter, GL.Ext.MultiTexParameterI, GL.Ext.MultiTexRenderbuffer, GL.Ext.MultiTexSubImage1D, GL.Ext.MultiTexSubImage2D, GL.Ext.MultiTexSubImage3D, GL.NV.GetPathTexGen, GL.NV.MultiTexCoord1h, GL.NV.MultiTexCoord2h, GL.NV.MultiTexCoord3h, GL.NV.MultiTexCoord4h ///