ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 20:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated tokens for EXT_transform_feedback (http://www.opentk.com/node/602). Updated tokens for ARB_uniform_ buffer_object (http://www.opentk.com/node/748). The generator no longer trims the 's' suffix from Varyings.

Browse source
This commit is contained in:
the_fiddler 2009-03-29 19:26:57 +00:00
parent 364bef5478
commit b4f0b86239
7 changed files with 109 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -542,21 +542,21 @@ VERSION_3_0 enum:
# RGB9_E5 = 0x8C3D
# UNSIGNED_INT_5_9_9_9_REV = 0x8C3E
# TEXTURE_SHARED_SIZE = 0x8C3F
TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76
TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F
MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 0x8C80
TRANSFORM_FEEDBACK_VARYINGS = 0x8C83
TRANSFORM_FEEDBACK_BUFFER_START = 0x8C84
TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85
PRIMITIVES_GENERATED = 0x8C87
TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88
RASTERIZER_DISCARD = 0x8C89
MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A
MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B
INTERLEAVED_ATTRIBS = 0x8C8C
SEPARATE_ATTRIBS = 0x8C8D
TRANSFORM_FEEDBACK_BUFFER = 0x8C8E
TRANSFORM_FEEDBACK_BUFFER_BINDING = 0x8C8F
# TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76
# TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F
# MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 0x8C80
# TRANSFORM_FEEDBACK_VARYINGS = 0x8C83
# TRANSFORM_FEEDBACK_BUFFER_START = 0x8C84
# TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85
# PRIMITIVES_GENERATED = 0x8C87
# TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88
# RASTERIZER_DISCARD = 0x8C89
# MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A
# MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B
# INTERLEAVED_ATTRIBS = 0x8C8C
# SEPARATE_ATTRIBS = 0x8C8D
# TRANSFORM_FEEDBACK_BUFFER = 0x8C8E
# TRANSFORM_FEEDBACK_BUFFER_BINDING = 0x8C8F
# RGBA32UI = 0x8D70
# RGB32UI = 0x8D71
# RGBA16UI = 0x8D76
@ -6480,6 +6480,43 @@ ConditionalRenderType enum:
QUERY_BY_REGION_WAIT = 0x8E15
QUERY_BY_REGION_NO_WAIT = 0x8E16
# Promoted from EXT_draw_buffers2
# Promoted from EXT_transform_feedback
GetIndexedPName enum:
TRANSFORM_FEEDBACK_BUFFER_START = 0x8C84
TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85
TRANSFORM_FEEDBACK_BUFFER_BINDING = 0x8C8F
GetPName enum:
MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 0x8C80
MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A
MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B
ProgramParameter enum:
TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76
TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F
TRANSFORM_FEEDBACK_VARYINGS = 0x8C83
QueryTarget enum:
PRIMITIVES_GENERATED = 0x8C87
TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88
EnableCap enum:
RASTERIZER_DISCARD = 0x8C89
TransformFeedbackMode enum:
INTERLEAVED_ATTRIBS = 0x8C8C
SEPARATE_ATTRIBS = 0x8C8D
BufferTarget enum:
TRANSFORM_FEEDBACK_BUFFER = 0x8C8E
BeginFeedbackMode enum:
use BeginMode Points
use BeginMode Lines
use BeginMode Triangles
# Other OpenGL 3.0 changes:
GetPName enum:
MAJOR_VERSION = 0x821B
@ -6521,7 +6558,7 @@ GetIndexedPName enum:
use ARB_uniform_buffer_object UNIFORM_BUFFER_START
use ARB_uniform_buffer_object UNIFORM_BUFFER_SIZE
AssemblyProgramParameterARB enum:
ProgramParameter enum:
use ARB_uniform_buffer_object ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH
use ARB_uniform_buffer_object ACTIVE_UNIFORM_BLOCKS

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

@ -7189,7 +7189,7 @@ IsEnabledi(target, index)
BeginTransformFeedback(primitiveMode)
return void
param primitiveMode GLenum in value
param primitiveMode BeginFeedbackMode in value # GLenum in value
category VERSION_3_0
version 3.0
extension
@ -7241,7 +7241,7 @@ TransformFeedbackVaryings(program, count, varyings, bufferMode)
param program UInt32 in value
param count SizeI in value
param varyings CharPointer in array [count]
param bufferMode GLenum in value
param bufferMode TransformFeedbackMode in value # GLenum in value
category VERSION_3_0
version 3.0
extension

2
Source/Bind/Structures/Function.cs
View file

@ -34,7 +34,7 @@ namespace Bind.Structures
#endregion
static Regex endings = new Regex(@"((([df]|u?[isb])_?v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft);
static Regex endingsNotToTrim = new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Flagv|Tess|Status|Pixels|Instanced|Indexed)", RegexOptions.Compiled | RegexOptions.RightToLeft);
static Regex endingsNotToTrim = new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Flagv|Tess|Status|Pixels|Instanced|Indexed|Varyings)", RegexOptions.Compiled | RegexOptions.RightToLeft);
// Add a trailing v to functions matching this regex. Used to differntiate between overloads taking both
// a 'type' and a 'ref type' (such overloads are not CLS Compliant).

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

@ -50045,13 +50045,13 @@ namespace OpenTK.Graphics
[AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glBeginTransformFeedback")]
public static
void BeginTransformFeedback(OpenTK.Graphics.Version30 primitiveMode)
void BeginTransformFeedback(OpenTK.Graphics.BeginFeedbackMode primitiveMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
Delegates.glBeginTransformFeedback((OpenTK.Graphics.Version30)primitiveMode);
Delegates.glBeginTransformFeedback((OpenTK.Graphics.BeginFeedbackMode)primitiveMode);
#if DEBUG
}
#endif
@ -50118,13 +50118,13 @@ namespace OpenTK.Graphics
[System.CLSCompliant(false)]
[AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glTransformFeedbackVaryings")]
public static
void TransformFeedbackVarying(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.Version30 bufferMode)
void TransformFeedbackVaryings(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.TransformFeedbackMode bufferMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
Delegates.glTransformFeedbackVaryings((UInt32)program, (Int32)count, (String)varyings, (OpenTK.Graphics.Version30)bufferMode);
Delegates.glTransformFeedbackVaryings((UInt32)program, (Int32)count, (String)varyings, (OpenTK.Graphics.TransformFeedbackMode)bufferMode);
#if DEBUG
}
#endif
@ -50132,9 +50132,9 @@ namespace OpenTK.Graphics
[AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glTransformFeedbackVaryings")]
public static
void TransformFeedbackVarying(Int32 program, Int32 count, String varyings, OpenTK.Graphics.Version30 bufferMode)
void TransformFeedbackVaryings(Int32 program, Int32 count, String varyings, OpenTK.Graphics.TransformFeedbackMode bufferMode)
{
Delegates.glTransformFeedbackVaryings((UInt32)program, (Int32)count, (String)varyings, (OpenTK.Graphics.Version30)bufferMode);
Delegates.glTransformFeedbackVaryings((UInt32)program, (Int32)count, (String)varyings, (OpenTK.Graphics.TransformFeedbackMode)bufferMode);
}
[System.CLSCompliant(false)]
@ -71165,7 +71165,7 @@ namespace OpenTK.Graphics
[System.CLSCompliant(false)]
[AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackVaryingsNV")]
public static
void TransformFeedbackVarying(UInt32 program, Int32 count, Int32[] locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
void TransformFeedbackVaryings(UInt32 program, Int32 count, Int32[] locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -71185,7 +71185,7 @@ namespace OpenTK.Graphics
[AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackVaryingsNV")]
public static
void TransformFeedbackVarying(Int32 program, Int32 count, Int32[] locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
void TransformFeedbackVaryings(Int32 program, Int32 count, Int32[] locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -71206,7 +71206,7 @@ namespace OpenTK.Graphics
[System.CLSCompliant(false)]
[AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackVaryingsNV")]
public static
void TransformFeedbackVarying(UInt32 program, Int32 count, ref Int32 locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
void TransformFeedbackVaryings(UInt32 program, Int32 count, ref Int32 locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -71226,7 +71226,7 @@ namespace OpenTK.Graphics
[AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackVaryingsNV")]
public static
void TransformFeedbackVarying(Int32 program, Int32 count, ref Int32 locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
void TransformFeedbackVaryings(Int32 program, Int32 count, ref Int32 locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -71247,7 +71247,7 @@ namespace OpenTK.Graphics
[System.CLSCompliant(false)]
[AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackVaryingsNV")]
public static
unsafe void TransformFeedbackVarying(UInt32 program, Int32 count, Int32* locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
unsafe void TransformFeedbackVaryings(UInt32 program, Int32 count, Int32* locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -71262,7 +71262,7 @@ namespace OpenTK.Graphics
[System.CLSCompliant(false)]
[AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackVaryingsNV")]
public static
unsafe void TransformFeedbackVarying(Int32 program, Int32 count, Int32* locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
unsafe void TransformFeedbackVaryings(Int32 program, Int32 count, Int32* locations, OpenTK.Graphics.NvTransformFeedback bufferMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -113848,7 +113848,7 @@ namespace OpenTK.Graphics
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ExtTransformFeedback", Version = "2.0", EntryPoint = "glTransformFeedbackVaryingsEXT")]
public static
void TransformFeedbackVarying(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.ExtTransformFeedback bufferMode)
void TransformFeedbackVaryings(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.ExtTransformFeedback bufferMode)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -113862,7 +113862,7 @@ namespace OpenTK.Graphics
[AutoGenerated(Category = "ExtTransformFeedback", Version = "2.0", EntryPoint = "glTransformFeedbackVaryingsEXT")]
public static
void TransformFeedbackVarying(Int32 program, Int32 count, String varyings, OpenTK.Graphics.ExtTransformFeedback bufferMode)
void TransformFeedbackVaryings(Int32 program, Int32 count, String varyings, OpenTK.Graphics.ExtTransformFeedback bufferMode)
{
Delegates.glTransformFeedbackVaryingsEXT((UInt32)program, (Int32)count, (String)varyings, (OpenTK.Graphics.ExtTransformFeedback)bufferMode);
}

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

@ -1804,7 +1804,7 @@ namespace OpenTK.Graphics
internal extern static bool IsEnabledi(OpenTK.Graphics.IndexedEnableCap target, UInt32 index);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBeginTransformFeedback", ExactSpelling = true)]
internal extern static void BeginTransformFeedback(OpenTK.Graphics.Version30 primitiveMode);
internal extern static void BeginTransformFeedback(OpenTK.Graphics.BeginFeedbackMode primitiveMode);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEndTransformFeedback", ExactSpelling = true)]
internal extern static void EndTransformFeedback();
@ -1816,7 +1816,7 @@ namespace OpenTK.Graphics
internal extern static void BindBufferBase(OpenTK.Graphics.BufferTarget target, UInt32 index, UInt32 buffer);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glTransformFeedbackVaryings", ExactSpelling = true)]
internal extern static void TransformFeedbackVaryings(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.Version30 bufferMode);
internal extern static void TransformFeedbackVaryings(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.TransformFeedbackMode bufferMode);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetTransformFeedbackVarying", ExactSpelling = true)]
internal extern static unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [Out] Int32* length, [Out] Int32* size, [Out] OpenTK.Graphics.Version30* type, [Out] System.Text.StringBuilder name);

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

@ -1805,7 +1805,7 @@ namespace OpenTK.Graphics
internal delegate bool IsEnabledi(OpenTK.Graphics.IndexedEnableCap target, UInt32 index);
internal static IsEnabledi glIsEnabledi;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void BeginTransformFeedback(OpenTK.Graphics.Version30 primitiveMode);
internal delegate void BeginTransformFeedback(OpenTK.Graphics.BeginFeedbackMode primitiveMode);
internal static BeginTransformFeedback glBeginTransformFeedback;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void EndTransformFeedback();
@ -1817,7 +1817,7 @@ namespace OpenTK.Graphics
internal delegate void BindBufferBase(OpenTK.Graphics.BufferTarget target, UInt32 index, UInt32 buffer);
internal static BindBufferBase glBindBufferBase;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void TransformFeedbackVaryings(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.Version30 bufferMode);
internal delegate void TransformFeedbackVaryings(UInt32 program, Int32 count, String varyings, OpenTK.Graphics.TransformFeedbackMode bufferMode);
internal static TransformFeedbackVaryings glTransformFeedbackVaryings;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [Out] Int32* length, [Out] Int32* size, [Out] OpenTK.Graphics.Version30* type, [Out] System.Text.StringBuilder name);

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

@ -393,6 +393,7 @@ namespace OpenTK.Graphics
VertexProgramPointSize = ((int)0X8642),
VertexProgramTwoSide = ((int)0X8643),
PointSprite = ((int)0X8861),
RasterizerDiscard = ((int)0X8c89),
FramebufferSrgb = ((int)0X8Db9),
}
@ -1057,6 +1058,9 @@ namespace OpenTK.Graphics
CurrentProgram = ((int)0X8b8d),
TextureBinding1DArray = ((int)0X8c1c),
TextureBinding2DArray = ((int)0X8c1d),
MaxTransformFeedbackSeparateComponents = ((int)0X8c80),
MaxTransformFeedbackInterleavedComponents = ((int)0X8c8a),
MaxTransformFeedbackSeparateAttribs = ((int)0X8c8b),
StencilBackRef = ((int)0X8ca3),
StencilBackValueMask = ((int)0X8ca4),
StencilBackWritemask = ((int)0X8ca5),
@ -6381,21 +6385,6 @@ namespace OpenTK.Graphics
StencilBuffer = ((int)0X8224),
MaxVaryingComponents = ((int)0X8b4b),
UnsignedNormalized = ((int)0X8c17),
TransformFeedbackVaryingMaxLength = ((int)0X8c76),
TransformFeedbackBufferMode = ((int)0X8c7f),
MaxTransformFeedbackSeparateComponents = ((int)0X8c80),
TransformFeedbackVaryings = ((int)0X8c83),
TransformFeedbackBufferStart = ((int)0X8c84),
TransformFeedbackBufferSize = ((int)0X8c85),
PrimitivesGenerated = ((int)0X8c87),
TransformFeedbackPrimitivesWritten = ((int)0X8c88),
RasterizerDiscard = ((int)0X8c89),
MaxTransformFeedbackInterleavedComponents = ((int)0X8c8a),
MaxTransformFeedbackSeparateAttribs = ((int)0X8c8b),
InterleavedAttribs = ((int)0X8c8c),
SeparateAttribs = ((int)0X8c8d),
TransformFeedbackBuffer = ((int)0X8c8e),
TransformFeedbackBufferBinding = ((int)0X8c8f),
}
public enum ArbMultitexture
@ -6687,8 +6676,6 @@ namespace OpenTK.Graphics
MaxProgramLocalParameters = ((int)0X88b4),
MaxProgramEnvParameters = ((int)0X88b5),
ProgramUnderNativeLimits = ((int)0X88b6),
ActiveUniformBlockMaxNameLength = ((int)0X8a35),
ActiveUniformBlocks = ((int)0X8a36),
}
public enum AssemblyProgramStringParameterArb
@ -9624,6 +9611,8 @@ namespace OpenTK.Graphics
public enum QueryTarget
{
SamplesPassed = ((int)0X8914),
PrimitivesGenerated = ((int)0X8c87),
TransformFeedbackPrimitivesWritten = ((int)0X8c88),
}
public enum GetQueryParam
@ -9645,6 +9634,7 @@ namespace OpenTK.Graphics
PixelPackBuffer = ((int)0X88eb),
PixelUnpackBuffer = ((int)0X88ec),
UniformBuffer = ((int)0X8a11),
TransformFeedbackBuffer = ((int)0X8c8e),
CopyReadBuffer = ((int)0X8f36),
CopyWriteBuffer = ((int)0X8f37),
}
@ -9775,6 +9765,8 @@ namespace OpenTK.Graphics
public enum ProgramParameter
{
ActiveUniformBlockMaxNameLength = ((int)0X8a35),
ActiveUniformBlocks = ((int)0X8a36),
DeleteStatus = ((int)0X8b80),
LinkStatus = ((int)0X8b82),
ValidateStatus = ((int)0X8b83),
@ -9784,6 +9776,9 @@ namespace OpenTK.Graphics
ActiveUniformMaxLength = ((int)0X8b87),
ActiveAttributes = ((int)0X8b89),
ActiveAttributeMaxLength = ((int)0X8b8a),
TransformFeedbackVaryingMaxLength = ((int)0X8c76),
TransformFeedbackBufferMode = ((int)0X8c7f),
TransformFeedbackVaryings = ((int)0X8c83),
}
public enum VertexAttribParameter
@ -9881,6 +9876,29 @@ namespace OpenTK.Graphics
QueryByRegionNoWait = ((int)0X8e16),
}
public enum GetIndexedPName
{
UniformBufferBinding = ((int)0X8a28),
UniformBufferStart = ((int)0X8a29),
UniformBufferSize = ((int)0X8a2a),
TransformFeedbackBufferStart = ((int)0X8c84),
TransformFeedbackBufferSize = ((int)0X8c85),
TransformFeedbackBufferBinding = ((int)0X8c8f),
}
public enum TransformFeedbackMode
{
InterleavedAttribs = ((int)0X8c8c),
SeparateAttribs = ((int)0X8c8d),
}
public enum BeginFeedbackMode
{
Points = ((int)0X0000),
Lines = ((int)0X0001),
Triangles = ((int)0X0004),
}
public enum IndexedStringName
{
Extensions = ((int)0X1f03),
@ -9891,13 +9909,6 @@ namespace OpenTK.Graphics
Blend = ((int)0X0be2),
}
public enum GetIndexedPName
{
UniformBufferBinding = ((int)0X8a28),
UniformBufferStart = ((int)0X8a29),
UniformBufferSize = ((int)0X8a2a),
}
public enum BufferParameterApple
{
BufferSerializedModifyApple = ((int)0X8a12),