From 9cb660bf852c65ab63e53f01d4aa3bf78fec4b6f Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Mon, 16 Nov 2009 14:15:56 +0000 Subject: [PATCH] Added new OpenGL 3.x tokens to GenerateMipmap. Fixes issue [#1162]: "GL.GenerateMipmap argument". --- Source/Bind/Specifications/GL2/enumext.spec | 6 ++++++ Source/OpenTK/Graphics/OpenGL/GLEnums.cs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index 9c5ff5a9..ce94eab6 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -7721,7 +7721,11 @@ BufferPointerNameARB enum: GenerateMipmapTarget enum: use TextureTarget TEXTURE_1D + use TextureTarget TEXTURE_1D_ARRAY use TextureTarget TEXTURE_2D + use TextureTarget TEXTURE_2D_ARRAY + use TextureTarget TEXTURE_2D_MULTISAMPLE + use TextureTarget TEXTURE_2D_MULTISAMPLE_ARRAY use TextureTarget TEXTURE_3D use TextureTarget TEXTURE_CUBE_MAP @@ -7839,7 +7843,9 @@ GetTextureParameter enum: TextureTarget enum: TEXTURE_2D_MULTISAMPLE = 0x9100 + PROXY_TEXTURE_2D_MULTISAMPLE = 0x9101 TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9102 + PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY = 0x9103 ActiveUniformType enum: SAMPLER_2D_MULTISAMPLE = 0x9108 diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs index 6624ccae..67badec1 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs @@ -7016,6 +7016,10 @@ namespace OpenTK.Graphics.OpenGL Texture2D = ((int)0x0DE1), Texture3D = ((int)0x806F), TextureCubeMap = ((int)0x8513), + Texture1DArray = ((int)0x8C18), + Texture2DArray = ((int)0x8C1A), + Texture2DMultisample = ((int)0x9100), + Texture2DMultisampleArray = ((int)0x9102), } public enum GetColorTableParameterPName : int @@ -10457,7 +10461,9 @@ namespace OpenTK.Graphics.OpenGL ProxyTexture2DArray = ((int)0x8C1B), TextureBuffer = ((int)0x8C2A), Texture2DMultisample = ((int)0x9100), + ProxyTexture2DMultisample = ((int)0x9101), Texture2DMultisampleArray = ((int)0x9102), + ProxyTexture2DMultisampleArray = ((int)0x9103), } public enum TextureTargetMultisample : int