From ca63c874a0aee3d22f32995af0203dd509948909 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sun, 29 Mar 2009 16:05:13 +0000 Subject: [PATCH] Updated tokens for NV_conditional_render. Issue http://www.opentk.com/node/597 --- Source/Bind/Specifications/GL2/enumext.spec | 19 +++++++++++++------ 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 | 12 ++++++++---- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec index 3fe17455..722b41e7 100644 --- a/Source/Bind/Specifications/GL2/enumext.spec +++ b/Source/Bind/Specifications/GL2/enumext.spec @@ -597,10 +597,10 @@ VERSION_3_0 enum: # UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4 # UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6 # UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7 - QUERY_WAIT = 0x8E13 - QUERY_NO_WAIT = 0x8E14 - QUERY_BY_REGION_WAIT = 0x8E15 - QUERY_BY_REGION_NO_WAIT = 0x8E16 +# QUERY_WAIT = 0x8E13 +# QUERY_NO_WAIT = 0x8E14 +# QUERY_BY_REGION_WAIT = 0x8E15 +# QUERY_BY_REGION_NO_WAIT = 0x8E16 passthru: /* Reuse tokens from ARB_depth_buffer_float */ # use ARB_depth_buffer_float DEPTH_COMPONENT32F # use ARB_depth_buffer_float DEPTH32F_STENCIL8 @@ -6473,15 +6473,22 @@ BufferAccessMask enum: use ARB_map_buffer_range MAP_FLUSH_EXPLICIT_BIT use ARB_map_buffer_range MAP_UNSYNCHRONIZED_BIT +# Promoted from NV_conditional_render: +ConditionalRenderType enum: + QUERY_WAIT = 0x8E13 + QUERY_NO_WAIT = 0x8E14 + QUERY_BY_REGION_WAIT = 0x8E15 + QUERY_BY_REGION_NO_WAIT = 0x8E16 + # Other OpenGL 3.0 changes: GetPName enum: MAJOR_VERSION = 0x821B MINOR_VERSION = 0x821C - NUM_EXTENSIONS = 0x821D + NUM_EXTENSIONS = 0x821D CONTEXT_FLAGS = 0x821E IndexedStringName enum: - use StringName EXTENSIONS # Used in GetStringi + use StringName EXTENSIONS # Used in GetStringi # Version 3.1 diff --git a/Source/Bind/Specifications/GL2/gl.spec b/Source/Bind/Specifications/GL2/gl.spec index 5021d328..ef3d3b7e 100644 --- a/Source/Bind/Specifications/GL2/gl.spec +++ b/Source/Bind/Specifications/GL2/gl.spec @@ -7282,7 +7282,7 @@ ClampColor(target, clamp) BeginConditionalRender(id, mode) return void param id UInt32 in value - param mode TypeEnum in value + param mode ConditionalRenderType in value # TypeEnum in value category VERSION_3_0 version 3.0 glfflags ignore diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs index e824d05a..73d98c09 100644 --- a/Source/OpenTK/Graphics/GL/GL.cs +++ b/Source/OpenTK/Graphics/GL/GL.cs @@ -50280,13 +50280,13 @@ namespace OpenTK.Graphics [System.CLSCompliant(false)] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBeginConditionalRender")] public static - void BeginConditionalRender(UInt32 id, OpenTK.Graphics.Version30 mode) + void BeginConditionalRender(UInt32 id, OpenTK.Graphics.ConditionalRenderType mode) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glBeginConditionalRender((UInt32)id, (OpenTK.Graphics.Version30)mode); + Delegates.glBeginConditionalRender((UInt32)id, (OpenTK.Graphics.ConditionalRenderType)mode); #if DEBUG } #endif @@ -50294,9 +50294,9 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBeginConditionalRender")] public static - void BeginConditionalRender(Int32 id, OpenTK.Graphics.Version30 mode) + void BeginConditionalRender(Int32 id, OpenTK.Graphics.ConditionalRenderType mode) { - Delegates.glBeginConditionalRender((UInt32)id, (OpenTK.Graphics.Version30)mode); + Delegates.glBeginConditionalRender((UInt32)id, (OpenTK.Graphics.ConditionalRenderType)mode); } [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glEndConditionalRender")] diff --git a/Source/OpenTK/Graphics/GL/GLCore.cs b/Source/OpenTK/Graphics/GL/GLCore.cs index 996ed4fa..78aea191 100644 --- a/Source/OpenTK/Graphics/GL/GLCore.cs +++ b/Source/OpenTK/Graphics/GL/GLCore.cs @@ -1825,7 +1825,7 @@ namespace OpenTK.Graphics internal extern static void ClampColor(OpenTK.Graphics.ClampColorTarget target, OpenTK.Graphics.ClampColorMode clamp); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginConditionalRender", ExactSpelling = true)] - internal extern static void BeginConditionalRender(UInt32 id, OpenTK.Graphics.Version30 mode); + internal extern static void BeginConditionalRender(UInt32 id, OpenTK.Graphics.ConditionalRenderType mode); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndConditionalRender", ExactSpelling = true)] internal extern static void EndConditionalRender(); diff --git a/Source/OpenTK/Graphics/GL/GLDelegates.cs b/Source/OpenTK/Graphics/GL/GLDelegates.cs index f31f0689..9d54de8f 100644 --- a/Source/OpenTK/Graphics/GL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/GL/GLDelegates.cs @@ -1826,7 +1826,7 @@ namespace OpenTK.Graphics internal delegate void ClampColor(OpenTK.Graphics.ClampColorTarget target, OpenTK.Graphics.ClampColorMode clamp); internal static ClampColor glClampColor; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void BeginConditionalRender(UInt32 id, OpenTK.Graphics.Version30 mode); + internal delegate void BeginConditionalRender(UInt32 id, OpenTK.Graphics.ConditionalRenderType mode); internal static BeginConditionalRender glBeginConditionalRender; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void EndConditionalRender(); diff --git a/Source/OpenTK/Graphics/GL/GLEnums.cs b/Source/OpenTK/Graphics/GL/GLEnums.cs index 726425c7..e45a9d0b 100644 --- a/Source/OpenTK/Graphics/GL/GLEnums.cs +++ b/Source/OpenTK/Graphics/GL/GLEnums.cs @@ -6386,10 +6386,6 @@ namespace OpenTK.Graphics SeparateAttribs = ((int)0X8c8d), TransformFeedbackBuffer = ((int)0X8c8e), TransformFeedbackBufferBinding = ((int)0X8c8f), - QueryWait = ((int)0X8e13), - QueryNoWait = ((int)0X8e14), - QueryByRegionWait = ((int)0X8e15), - QueryByRegionNoWait = ((int)0X8e16), } public enum ArbMultitexture @@ -9864,6 +9860,14 @@ namespace OpenTK.Graphics MapUnsynchronizedBit = ((int)0X0020), } + public enum ConditionalRenderType + { + QueryWait = ((int)0X8e13), + QueryNoWait = ((int)0X8e14), + QueryByRegionWait = ((int)0X8e15), + QueryByRegionNoWait = ((int)0X8e16), + } + public enum IndexedStringName { Extensions = ((int)0X1f03),