ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-26 03:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated tokens for NV_conditional_render. Issue http://www.opentk.com/node/597

Browse source
This commit is contained in:
the_fiddler 2009-03-29 16:05:13 +00:00
parent 71d75282e4
commit d88faf0245
6 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Source/Bind/Specifications/GL2/enumext.spec
View file

@ -597,10 +597,10 @@ VERSION_3_0 enum:
# UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4 # UNSIGNED_INT_SAMPLER_CUBE = 0x8DD4
# UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6 # UNSIGNED_INT_SAMPLER_1D_ARRAY = 0x8DD6
# UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7 # UNSIGNED_INT_SAMPLER_2D_ARRAY = 0x8DD7
QUERY_WAIT = 0x8E13 # QUERY_WAIT = 0x8E13
QUERY_NO_WAIT = 0x8E14 # QUERY_NO_WAIT = 0x8E14
QUERY_BY_REGION_WAIT = 0x8E15 # QUERY_BY_REGION_WAIT = 0x8E15
QUERY_BY_REGION_NO_WAIT = 0x8E16 # QUERY_BY_REGION_NO_WAIT = 0x8E16
passthru: /* Reuse tokens from ARB_depth_buffer_float */ passthru: /* Reuse tokens from ARB_depth_buffer_float */
# use ARB_depth_buffer_float DEPTH_COMPONENT32F # use ARB_depth_buffer_float DEPTH_COMPONENT32F
# use ARB_depth_buffer_float DEPTH32F_STENCIL8 # use ARB_depth_buffer_float DEPTH32F_STENCIL8
@ -6473,6 +6473,13 @@ BufferAccessMask enum:
use ARB_map_buffer_range MAP_FLUSH_EXPLICIT_BIT use ARB_map_buffer_range MAP_FLUSH_EXPLICIT_BIT
use ARB_map_buffer_range MAP_UNSYNCHRONIZED_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: # Other OpenGL 3.0 changes:
GetPName enum: GetPName enum:
MAJOR_VERSION = 0x821B MAJOR_VERSION = 0x821B

2
Source/Bind/Specifications/GL2/gl.spec
View file

@ -7282,7 +7282,7 @@ ClampColor(target, clamp)
BeginConditionalRender(id, mode) BeginConditionalRender(id, mode)
return void return void
param id UInt32 in value param id UInt32 in value
param mode TypeEnum in value param mode ConditionalRenderType in value # TypeEnum in value
category VERSION_3_0 category VERSION_3_0
version 3.0 version 3.0
glfflags ignore glfflags ignore

8
Source/OpenTK/Graphics/GL/GL.cs
View file

@ -50280,13 +50280,13 @@ namespace OpenTK.Graphics
[System.CLSCompliant(false)] [System.CLSCompliant(false)]
[AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBeginConditionalRender")] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBeginConditionalRender")]
public static public static
void BeginConditionalRender(UInt32 id, OpenTK.Graphics.Version30 mode) void BeginConditionalRender(UInt32 id, OpenTK.Graphics.ConditionalRenderType mode)
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
{ {
#endif #endif
Delegates.glBeginConditionalRender((UInt32)id, (OpenTK.Graphics.Version30)mode); Delegates.glBeginConditionalRender((UInt32)id, (OpenTK.Graphics.ConditionalRenderType)mode);
#if DEBUG #if DEBUG
} }
#endif #endif
@ -50294,9 +50294,9 @@ namespace OpenTK.Graphics
[AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBeginConditionalRender")] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBeginConditionalRender")]
public static 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")] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glEndConditionalRender")]

2
Source/OpenTK/Graphics/GL/GLCore.cs
View file

@ -1825,7 +1825,7 @@ namespace OpenTK.Graphics
internal extern static void ClampColor(OpenTK.Graphics.ClampColorTarget target, OpenTK.Graphics.ClampColorMode clamp); internal extern static void ClampColor(OpenTK.Graphics.ClampColorTarget target, OpenTK.Graphics.ClampColorMode clamp);
[System.Security.SuppressUnmanagedCodeSecurity()] [System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginConditionalRender", ExactSpelling = true)] [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.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndConditionalRender", ExactSpelling = true)] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndConditionalRender", ExactSpelling = true)]
internal extern static void EndConditionalRender(); internal extern static void EndConditionalRender();

2
Source/OpenTK/Graphics/GL/GLDelegates.cs
View file

@ -1826,7 +1826,7 @@ namespace OpenTK.Graphics
internal delegate void ClampColor(OpenTK.Graphics.ClampColorTarget target, OpenTK.Graphics.ClampColorMode clamp); internal delegate void ClampColor(OpenTK.Graphics.ClampColorTarget target, OpenTK.Graphics.ClampColorMode clamp);
internal static ClampColor glClampColor; internal static ClampColor glClampColor;
[System.Security.SuppressUnmanagedCodeSecurity()] [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; internal static BeginConditionalRender glBeginConditionalRender;
[System.Security.SuppressUnmanagedCodeSecurity()] [System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void EndConditionalRender(); internal delegate void EndConditionalRender();

12
Source/OpenTK/Graphics/GL/GLEnums.cs
View file

@ -6386,10 +6386,6 @@ namespace OpenTK.Graphics
SeparateAttribs = ((int)0X8c8d), SeparateAttribs = ((int)0X8c8d),
TransformFeedbackBuffer = ((int)0X8c8e), TransformFeedbackBuffer = ((int)0X8c8e),
TransformFeedbackBufferBinding = ((int)0X8c8f), TransformFeedbackBufferBinding = ((int)0X8c8f),
QueryWait = ((int)0X8e13),
QueryNoWait = ((int)0X8e14),
QueryByRegionWait = ((int)0X8e15),
QueryByRegionNoWait = ((int)0X8e16),
} }
public enum ArbMultitexture public enum ArbMultitexture
@ -9864,6 +9860,14 @@ namespace OpenTK.Graphics
MapUnsynchronizedBit = ((int)0X0020), MapUnsynchronizedBit = ((int)0X0020),
} }
public enum ConditionalRenderType
{
QueryWait = ((int)0X8e13),
QueryNoWait = ((int)0X8e14),
QueryByRegionWait = ((int)0X8e15),
QueryByRegionNoWait = ((int)0X8e16),
}
public enum IndexedStringName public enum IndexedStringName
{ {
Extensions = ((int)0X1f03), Extensions = ((int)0X1f03),