From c396884cfe4a46d5fdec08bdc7ef9c8afbcfb2f6 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Mon, 7 Sep 2009 17:56:25 +0000 Subject: [PATCH] Updated tokens for ARB_texture_multisample (promoted in Version 3.2). Fixes issue [#1151]: "ARB_texture_multisample". --- Source/Bind/Specifications/GL2/enumext.spec | 49 ++++++++++++++++++- .../Bind/Specifications/GL2/gloverrides.xml | 17 +++++++ Source/OpenTK/Graphics/OpenGL/GL.cs | 32 ++++++------ Source/OpenTK/Graphics/OpenGL/GLCore.cs | 6 +-- Source/OpenTK/Graphics/OpenGL/GLDelegates.cs | 6 +-- Source/OpenTK/Graphics/OpenGL/GLEnums.cs | 32 ++++++++++++ 6 files changed, 119 insertions(+), 23 deletions(-) diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index 5f21b84e..0d7a5833 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -7793,5 +7793,52 @@ GetPName enum: ErrorCode enum: INVALID_FRAMEBUFFER_OPERATION_EXT = 0x0506 + + +# Version 3.2 -# End (don't remove, or the last token may be missed!) +# Tokens promoted from ARB_texture_multisample +# http://www.opengl.org/registry/specs/ARB/texture_multisample.txt + +TextureTargetMultisample enum: + TEXTURE_2D_MULTISAMPLE = 0x9100 + PROXY_TEXTURE_2D_MULTISAMPLE = 0x9101 + TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102 + PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9103 + +EnableCap enum: + SAMPLE_MASK = 0x8E51 + +GetMultisamplePName enum: + SAMPLE_POSITION = 0x8E50 + +GetPName enum: + SAMPLE_MASK = 0x8E51 + MAX_SAMPLE_MASK_WORDS = 0x8E59 + MAX_COLOR_TEXTURE_SAMPLES = 0x910E + MAX_DEPTH_TEXTURE_SAMPLES = 0x910F + MAX_INTEGER_SAMPLES = 0x9110 + TEXTURE_BINDING_2D_MULTISAMPLE = 0x9104 + TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY = 0x9105 + +GetIndexedPName enum: + SAMPLE_MASK_VALUE = 0x8E52 + +GetTextureParameter enum: + TEXTURE_SAMPLES = 0x9106 + TEXTURE_FIXED_SAMPLE_LOCATIONS = 0x9107 + +TextureTarget enum: + TEXTURE_2D_MULTISAMPLE = 0x9100 + TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102 + +ActiveUniformType enum: + SAMPLER_2D_MULTISAMPLE = 0x9108 + INT_SAMPLER_2D_MULTISAMPLE = 0x9109 + UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 0x910A + SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910B + INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910C + UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY = 0x910D + + +# End (don't remove, or the last token may be removed!) diff --git a/Source/Bind/Specifications/GL2/gloverrides.xml b/Source/Bind/Specifications/GL2/gloverrides.xml index 588cd962..2c73990a 100644 --- a/Source/Bind/Specifications/GL2/gloverrides.xml +++ b/Source/Bind/Specifications/GL2/gloverrides.xml @@ -267,6 +267,23 @@ SizedInternalFormat + + + + TextureTargetMultisample + PixelInternalFormat + + + + TextureTargetMultisample + PixelInternalFormat + + + + GetMultisamplePName + + + diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs index 962755d8..d3104834 100644 --- a/Source/OpenTK/Graphics/OpenGL/GL.cs +++ b/Source/OpenTK/Graphics/OpenGL/GL.cs @@ -46707,7 +46707,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")] public static - void GetMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample pname, Int32 index, [OutAttribute] out Single val) + void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, Int32 index, [OutAttribute] out Single val) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46717,7 +46717,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* val_ptr = &val) { - Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.ArbTextureMultisample)pname, (UInt32)index, (Single*)val_ptr); + Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.GetMultisamplePName)pname, (UInt32)index, (Single*)val_ptr); val = *val_ptr; } } @@ -46729,13 +46729,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")] public static - unsafe void GetMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample pname, Int32 index, [OutAttribute] Single* val) + unsafe void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, Int32 index, [OutAttribute] Single* val) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.ArbTextureMultisample)pname, (UInt32)index, (Single*)val); + Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.GetMultisamplePName)pname, (UInt32)index, (Single*)val); #if DEBUG } #endif @@ -46743,7 +46743,7 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")] public static - void GetMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample pname, Int32 index, [OutAttribute] Single[] val) + void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, Int32 index, [OutAttribute] Single[] val) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46753,7 +46753,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* val_ptr = val) { - Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.ArbTextureMultisample)pname, (UInt32)index, (Single*)val_ptr); + Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.GetMultisamplePName)pname, (UInt32)index, (Single*)val_ptr); } } #if DEBUG @@ -46764,7 +46764,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")] public static - void GetMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample pname, UInt32 index, [OutAttribute] out Single val) + void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, UInt32 index, [OutAttribute] out Single val) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46774,7 +46774,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* val_ptr = &val) { - Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.ArbTextureMultisample)pname, (UInt32)index, (Single*)val_ptr); + Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.GetMultisamplePName)pname, (UInt32)index, (Single*)val_ptr); val = *val_ptr; } } @@ -46786,13 +46786,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")] public static - unsafe void GetMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample pname, UInt32 index, [OutAttribute] Single* val) + unsafe void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, UInt32 index, [OutAttribute] Single* val) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.ArbTextureMultisample)pname, (UInt32)index, (Single*)val); + Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.GetMultisamplePName)pname, (UInt32)index, (Single*)val); #if DEBUG } #endif @@ -46801,7 +46801,7 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")] public static - void GetMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample pname, UInt32 index, [OutAttribute] Single[] val) + void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, UInt32 index, [OutAttribute] Single[] val) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46811,7 +46811,7 @@ namespace OpenTK.Graphics.OpenGL { fixed (Single* val_ptr = val) { - Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.ArbTextureMultisample)pname, (UInt32)index, (Single*)val_ptr); + Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.GetMultisamplePName)pname, (UInt32)index, (Single*)val_ptr); } } #if DEBUG @@ -70318,13 +70318,13 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glTexImage2DMultisample")] public static - void TexImage2DMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample target, Int32 samples, Int32 internalformat, Int32 width, Int32 height, bool fixedsamplelocations) + void TexImage2DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, bool fixedsamplelocations) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexImage2DMultisample((OpenTK.Graphics.OpenGL.ArbTextureMultisample)target, (Int32)samples, (Int32)internalformat, (Int32)width, (Int32)height, (bool)fixedsamplelocations); + Delegates.glTexImage2DMultisample((OpenTK.Graphics.OpenGL.TextureTargetMultisample)target, (Int32)samples, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (bool)fixedsamplelocations); #if DEBUG } #endif @@ -70708,13 +70708,13 @@ namespace OpenTK.Graphics.OpenGL [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glTexImage3DMultisample")] public static - void TexImage3DMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample target, Int32 samples, Int32 internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations) + void TexImage3DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glTexImage3DMultisample((OpenTK.Graphics.OpenGL.ArbTextureMultisample)target, (Int32)samples, (Int32)internalformat, (Int32)width, (Int32)height, (Int32)depth, (bool)fixedsamplelocations); + Delegates.glTexImage3DMultisample((OpenTK.Graphics.OpenGL.TextureTargetMultisample)target, (Int32)samples, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (bool)fixedsamplelocations); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs index a05bb340..0831f587 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs @@ -1846,7 +1846,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static unsafe void GetMinmaxParameterivEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetMultisamplefv", ExactSpelling = true)] - internal extern static unsafe void GetMultisamplefv(OpenTK.Graphics.OpenGL.ArbTextureMultisample pname, UInt32 index, [OutAttribute] Single* val); + internal extern static unsafe void GetMultisamplefv(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, UInt32 index, [OutAttribute] Single* val); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetMultisamplefvNV", ExactSpelling = true)] internal extern static unsafe void GetMultisamplefvNV(OpenTK.Graphics.OpenGL.NvExplicitMultisample pname, UInt32 index, [OutAttribute] Single* val); @@ -4408,7 +4408,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static void TexImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage2DMultisample", ExactSpelling = true)] - internal extern static void TexImage2DMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample target, Int32 samples, Int32 internalformat, Int32 width, Int32 height, bool fixedsamplelocations); + internal extern static void TexImage2DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, bool fixedsamplelocations); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage3D", ExactSpelling = true)] internal extern static void TexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); @@ -4417,7 +4417,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static void TexImage3DEXT(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage3DMultisample", ExactSpelling = true)] - internal extern static void TexImage3DMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample target, Int32 samples, Int32 internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations); + internal extern static void TexImage3DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTexImage4DSGIS", ExactSpelling = true)] internal extern static void TexImage4DSGIS(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs index b1684c60..c3ff391e 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs @@ -1844,7 +1844,7 @@ namespace OpenTK.Graphics.OpenGL internal unsafe delegate void GetMinmaxParameterivEXT(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params); internal unsafe static GetMinmaxParameterivEXT glGetMinmaxParameterivEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate void GetMultisamplefv(OpenTK.Graphics.OpenGL.ArbTextureMultisample pname, UInt32 index, [OutAttribute] Single* val); + internal unsafe delegate void GetMultisamplefv(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, UInt32 index, [OutAttribute] Single* val); internal unsafe static GetMultisamplefv glGetMultisamplefv; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetMultisamplefvNV(OpenTK.Graphics.OpenGL.NvExplicitMultisample pname, UInt32 index, [OutAttribute] Single* val); @@ -4406,7 +4406,7 @@ namespace OpenTK.Graphics.OpenGL internal delegate void TexImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); internal static TexImage2D glTexImage2D; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexImage2DMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample target, Int32 samples, Int32 internalformat, Int32 width, Int32 height, bool fixedsamplelocations); + internal delegate void TexImage2DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, bool fixedsamplelocations); internal static TexImage2DMultisample glTexImage2DMultisample; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void TexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); @@ -4415,7 +4415,7 @@ namespace OpenTK.Graphics.OpenGL internal delegate void TexImage3DEXT(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); internal static TexImage3DEXT glTexImage3DEXT; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void TexImage3DMultisample(OpenTK.Graphics.OpenGL.ArbTextureMultisample target, Int32 samples, Int32 internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations); + internal delegate void TexImage3DMultisample(OpenTK.Graphics.OpenGL.TextureTargetMultisample target, Int32 samples, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, bool fixedsamplelocations); internal static TexImage3DMultisample glTexImage3DMultisample; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void TexImage4DSGIS(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels); diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs index 8dde522b..efc443c7 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs @@ -100,6 +100,12 @@ namespace OpenTK.Graphics.OpenGL UnsignedIntSamplerCube = ((int)0X8dd4), UnsignedIntSampler1DArray = ((int)0X8dd6), UnsignedIntSampler2DArray = ((int)0X8dd7), + Sampler2DMultisample = ((int)0X9108), + IntSampler2DMultisample = ((int)0X9109), + UnsignedIntSampler2DMultisample = ((int)0X910a), + Sampler2DMultisampleArray = ((int)0X910b), + IntSampler2DMultisampleArray = ((int)0X910c), + UnsignedIntSampler2DMultisampleArray = ((int)0X910d), } public enum All @@ -5720,6 +5726,7 @@ namespace OpenTK.Graphics.OpenGL PointSprite = ((int)0X8861), RasterizerDiscard = ((int)0X8c89), FramebufferSrgb = ((int)0X8Db9), + SampleMask = ((int)0X8e51), } public enum ErrorCode @@ -7081,6 +7088,7 @@ namespace OpenTK.Graphics.OpenGL TransformFeedbackBufferStart = ((int)0X8c84), TransformFeedbackBufferSize = ((int)0X8c85), TransformFeedbackBufferBinding = ((int)0X8c8f), + SampleMaskValue = ((int)0X8e52), } public enum GetMapQuery @@ -7102,6 +7110,11 @@ namespace OpenTK.Graphics.OpenGL MinmaxSinkExt = ((int)0X8030), } + public enum GetMultisamplePName + { + SamplePosition = ((int)0X8e50), + } + public enum GetPixelMap { PixelMapIToI = ((int)0X0c70), @@ -7629,6 +7642,13 @@ namespace OpenTK.Graphics.OpenGL MaxColorAttachmentsExt = ((int)0X8cdf), MaxSamples = ((int)0X8D57), FramebufferSrgb = ((int)0X8Db9), + SampleMask = ((int)0X8e51), + MaxSampleMaskWords = ((int)0X8e59), + TextureBinding2DMultisample = ((int)0X9104), + TextureBinding2DMultisampleArray = ((int)0X9105), + MaxColorTextureSamples = ((int)0X910e), + MaxDepthTextureSamples = ((int)0X910f), + MaxIntegerSamples = ((int)0X9110), } public enum GetPointervPName @@ -7735,6 +7755,8 @@ namespace OpenTK.Graphics.OpenGL TextureIntensityType = ((int)0X8c15), TextureDepthType = ((int)0X8c16), TextureSharedSize = ((int)0X8c3f), + TextureSamples = ((int)0X9106), + TextureFixedSampleLocations = ((int)0X9107), } public enum Gl3DfxMultisample @@ -10396,6 +10418,16 @@ namespace OpenTK.Graphics.OpenGL ProxyTexture1DArray = ((int)0X8c19), Texture2DArray = ((int)0X8c1a), ProxyTexture2DArray = ((int)0X8c1b), + Texture2DMultisample = ((int)0X9100), + Texture2DMultisampleArray = ((int)0X9102), + } + + public enum TextureTargetMultisample + { + Texture2DMultisample = ((int)0X9100), + ProxyTexture2DMultisample = ((int)0X9101), + Texture2DMultisampleArray = ((int)0X9102), + ProxyTexture2DMultisampleArray = ((int)0X9103), } public enum TextureUnit