From 447ecb46f337919241309c11b7b337edf2421d3a Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sun, 29 Mar 2009 15:19:53 +0000 Subject: [PATCH] Updated tokens for EXT_texture_ shared_exponent (issue [#600]), EXT_packed_float (issue [#599]) and added new OpenGL 3.0 tokens to GetPName (major/minor version, num_extensions and context_flags) and GetStringi. --- Source/Bind/Specifications/GL2/enumext.spec | 48 +++++++++++++++++---- Source/Bind/Specifications/GL2/gl.spec | 2 +- Source/OpenTK/Graphics/GL/GL.cs | 8 ++-- Source/OpenTK/Graphics/GL/GLCore.cs | 2 +- Source/OpenTK/Graphics/GL/GLDelegates.cs | 2 +- Source/OpenTK/Graphics/GL/GLEnums.cs | 17 +++++--- 6 files changed, 57 insertions(+), 22 deletions(-) diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index 0617b8ac..ee5ea029 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -501,10 +501,10 @@ VERSION_3_0 enum: CLIP_DISTANCE4 = GL_CLIP_PLANE4 CLIP_DISTANCE5 = GL_CLIP_PLANE5 MAX_CLIP_DISTANCES = GL_MAX_CLIP_PLANES - MAJOR_VERSION = 0x821B - MINOR_VERSION = 0x821C - NUM_EXTENSIONS = 0x821D - CONTEXT_FLAGS = 0x821E +# MAJOR_VERSION = 0x821B +# MINOR_VERSION = 0x821C +# NUM_EXTENSIONS = 0x821D +# CONTEXT_FLAGS = 0x821E DEPTH_BUFFER = 0x8223 STENCIL_BUFFER = 0x8224 # COMPRESSED_RED = 0x8225 @@ -538,9 +538,9 @@ VERSION_3_0 enum: # TEXTURE_BINDING_1D_ARRAY = 0x8C1C # TEXTURE_BINDING_2D_ARRAY = 0x8C1D # R11F_G11F_B10F = 0x8C3A - UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B +# UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B # RGB9_E5 = 0x8C3D - UNSIGNED_INT_5_9_9_9_REV = 0x8C3E +# UNSIGNED_INT_5_9_9_9_REV = 0x8C3E # TEXTURE_SHARED_SIZE = 0x8C3F TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76 TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F @@ -6104,8 +6104,6 @@ PixelInternalFormat enum: RGB32F = 0x8815 RGBA16F = 0x881A RGB16F = 0x881B - R11F_G11F_B10F = 0x8C3A - RGB9_E5 = 0x8C3D use ARB_depth_buffer_float DEPTH_COMPONENT32F use ARB_depth_buffer_float DEPTH32F_STENCIL8 use ARB_depth_buffer_float FLOAT_32_UNSIGNED_INT_24_8_REV @@ -6374,7 +6372,6 @@ PixelType enum: use ARB_framebuffer_object UNSIGNED_INT_24_8 GetTextureParameter enum: - TEXTURE_SHARED_SIZE = 0x8C3F use ARB_framebuffer_object TEXTURE_STENCIL_SIZE use ARB_framebuffer_object TEXTURE_RED_TYPE use ARB_framebuffer_object TEXTURE_GREEN_TYPE @@ -6443,5 +6440,38 @@ ActiveUniformType enum: GetPName enum: MIN_PROGRAM_TEXEL_OFFSET = 0x8904 MAX_PROGRAM_TEXEL_OFFSET = 0x8905 + +# Promoted from EXT_packed_float +PixelType enum: + UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B + +PixelInternalFormat enum: + R11F_G11F_B10F = 0x8C3A + +RenderbufferStorage enum: + use PixelInternalFormat R11F_G11F_B10F + +# Promoted from EXT_texture_ shared_exponent +PixelType enum: + UNSIGNED_INT_5_9_9_9_REV = 0x8C3E + +PixelInternalFormat enum: + RGB9_E5 = 0x8C3D + +RenderbufferStorage enum: + use PixelInternalFormat RGB9_E5 + +GetTextureParameter enum: + TEXTURE_SHARED_SIZE = 0x8C3F + +# Other OpenGL 3.0 changes: +GetPName enum: + MAJOR_VERSION = 0x821B + MINOR_VERSION = 0x821C + NUM_EXTENSIONS = 0x821D + CONTEXT_FLAGS = 0x821E + +IndexedStringName enum: + use StringName EXTENSIONS # Used in GetStringi # End (don't remove, or the last token may be missed!) diff --git a/Source/Bind/Specifications/GL2/gl.spec b/Source/Bind/Specifications/GL2/gl.spec index c8feb69d..3be78a78 100644 --- a/Source/Bind/Specifications/GL2/gl.spec +++ b/Source/Bind/Specifications/GL2/gl.spec @@ -7851,7 +7851,7 @@ ClearBufferfi(buffer, drawbuffer, depth, stencil) GetStringi(name, index) return String - param name GLenum in value + param name IndexedStringName in value param index UInt32 in value category VERSION_3_0 version 3.0 diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs index d1183301..f52f8f33 100644 --- a/Source/OpenTK/Graphics/GL/GL.cs +++ b/Source/OpenTK/Graphics/GL/GL.cs @@ -52912,13 +52912,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetStringi")] public static - string GetString(OpenTK.Graphics.Version30 name, UInt32 index) + string GetString(OpenTK.Graphics.IndexedStringName name, UInt32 index) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.glGetStringi((OpenTK.Graphics.Version30)name, (UInt32)index)); + return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.glGetStringi((OpenTK.Graphics.IndexedStringName)name, (UInt32)index)); #if DEBUG } #endif @@ -52935,13 +52935,13 @@ namespace OpenTK.Graphics /// [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetStringi")] public static - string GetString(OpenTK.Graphics.Version30 name, Int32 index) + string GetString(OpenTK.Graphics.IndexedStringName name, Int32 index) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.glGetStringi((OpenTK.Graphics.Version30)name, (UInt32)index)); + return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Delegates.glGetStringi((OpenTK.Graphics.IndexedStringName)name, (UInt32)index)); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/GL/GLCore.cs b/Source/OpenTK/Graphics/GL/GLCore.cs index 8d2e526e..cb7d5235 100644 --- a/Source/OpenTK/Graphics/GL/GLCore.cs +++ b/Source/OpenTK/Graphics/GL/GLCore.cs @@ -1957,7 +1957,7 @@ namespace OpenTK.Graphics internal extern static void ClearBufferfi(OpenTK.Graphics.Version30 buffer, Int32 drawbuffer, Single depth, Int32 stencil); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetStringi", ExactSpelling = true)] - internal extern static IntPtr GetStringi(OpenTK.Graphics.Version30 name, UInt32 index); + internal extern static IntPtr GetStringi(OpenTK.Graphics.IndexedStringName name, UInt32 index); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glIsRenderbuffer", ExactSpelling = true)] internal extern static bool IsRenderbuffer(UInt32 renderbuffer); diff --git a/Source/OpenTK/Graphics/GL/GLDelegates.cs b/Source/OpenTK/Graphics/GL/GLDelegates.cs index a731a25e..607c30cf 100644 --- a/Source/OpenTK/Graphics/GL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/GL/GLDelegates.cs @@ -1958,7 +1958,7 @@ namespace OpenTK.Graphics internal delegate void ClearBufferfi(OpenTK.Graphics.Version30 buffer, Int32 drawbuffer, Single depth, Int32 stencil); internal static ClearBufferfi glClearBufferfi; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate IntPtr GetStringi(OpenTK.Graphics.Version30 name, UInt32 index); + internal delegate IntPtr GetStringi(OpenTK.Graphics.IndexedStringName name, UInt32 index); internal static GetStringi glGetStringi; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void ActiveTextureARB(OpenTK.Graphics.TextureUnit texture); diff --git a/Source/OpenTK/Graphics/GL/GLEnums.cs b/Source/OpenTK/Graphics/GL/GLEnums.cs index 6c910634..5305b005 100644 --- a/Source/OpenTK/Graphics/GL/GLEnums.cs +++ b/Source/OpenTK/Graphics/GL/GLEnums.cs @@ -929,6 +929,10 @@ namespace OpenTK.Graphics FogOffsetValueSgix = ((int)0X8199), LightModelColorControl = ((int)0X81f8), SharedTexturePaletteExt = ((int)0X81fb), + MajorVersion = ((int)0X821b), + MinorVersion = ((int)0X821c), + NumExtensions = ((int)0X821d), + ContextFlags = ((int)0X821e), ConvolutionHintSgix = ((int)0X8316), AsyncMarkerSgix = ((int)0X8329), PixelTexGenModeSgix = ((int)0X832b), @@ -1547,6 +1551,8 @@ namespace OpenTK.Graphics UnsignedInt8888Reversed = ((int)0X8367), UnsignedInt2101010Reversed = ((int)0X8368), UnsignedInt248 = ((int)0X84fa), + UnsignedInt10F11F11FRev = ((int)0X8c3b), + UnsignedInt5999Rev = ((int)0X8c3e), Float32UnsignedInt248Rev = ((int)0X8Dad), } @@ -6366,16 +6372,10 @@ namespace OpenTK.Graphics ClipDistance3 = ((int)0X3003), ClipDistance4 = ((int)0X3004), ClipDistance5 = ((int)0X3005), - MajorVersion = ((int)0X821b), - MinorVersion = ((int)0X821c), - NumExtensions = ((int)0X821d), - ContextFlags = ((int)0X821e), DepthBuffer = ((int)0X8223), StencilBuffer = ((int)0X8224), MaxVaryingComponents = ((int)0X8b4b), UnsignedNormalized = ((int)0X8c17), - UnsignedInt10F11F11FRev = ((int)0X8c3b), - UnsignedInt5999Rev = ((int)0X8c3e), TransformFeedbackVaryingMaxLength = ((int)0X8c76), TransformFeedbackBufferMode = ((int)0X8c7f), MaxTransformFeedbackSeparateComponents = ((int)0X8c80), @@ -9856,4 +9856,9 @@ namespace OpenTK.Graphics UnsignedNormalized = ((int)0X8c17), } + public enum IndexedStringName + { + Extensions = ((int)0X1f03), + } + }