ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-25 04:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse source
This commit is contained in:
the_fiddler 2009-03-29 15:19:53 +00:00
parent 4ee1108523
commit 447ecb46f3
6 changed files with 57 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -501,10 +501,10 @@ VERSION_3_0 enum:
CLIP_DISTANCE4 = GL_CLIP_PLANE4 CLIP_DISTANCE4 = GL_CLIP_PLANE4
CLIP_DISTANCE5 = GL_CLIP_PLANE5 CLIP_DISTANCE5 = GL_CLIP_PLANE5
MAX_CLIP_DISTANCES = GL_MAX_CLIP_PLANES MAX_CLIP_DISTANCES = GL_MAX_CLIP_PLANES
MAJOR_VERSION = 0x821B # MAJOR_VERSION = 0x821B
MINOR_VERSION = 0x821C # MINOR_VERSION = 0x821C
NUM_EXTENSIONS = 0x821D # NUM_EXTENSIONS = 0x821D
CONTEXT_FLAGS = 0x821E # CONTEXT_FLAGS = 0x821E
DEPTH_BUFFER = 0x8223 DEPTH_BUFFER = 0x8223
STENCIL_BUFFER = 0x8224 STENCIL_BUFFER = 0x8224
# COMPRESSED_RED = 0x8225 # COMPRESSED_RED = 0x8225
@ -538,9 +538,9 @@ VERSION_3_0 enum:
# TEXTURE_BINDING_1D_ARRAY = 0x8C1C # TEXTURE_BINDING_1D_ARRAY = 0x8C1C
# TEXTURE_BINDING_2D_ARRAY = 0x8C1D # TEXTURE_BINDING_2D_ARRAY = 0x8C1D
# R11F_G11F_B10F = 0x8C3A # R11F_G11F_B10F = 0x8C3A
UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B # UNSIGNED_INT_10F_11F_11F_REV = 0x8C3B
# RGB9_E5 = 0x8C3D # RGB9_E5 = 0x8C3D
UNSIGNED_INT_5_9_9_9_REV = 0x8C3E # UNSIGNED_INT_5_9_9_9_REV = 0x8C3E
# TEXTURE_SHARED_SIZE = 0x8C3F # TEXTURE_SHARED_SIZE = 0x8C3F
TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76 TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 0x8C76
TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F TRANSFORM_FEEDBACK_BUFFER_MODE = 0x8C7F
@ -6104,8 +6104,6 @@ PixelInternalFormat enum:
RGB32F = 0x8815 RGB32F = 0x8815
RGBA16F = 0x881A RGBA16F = 0x881A
RGB16F = 0x881B RGB16F = 0x881B
R11F_G11F_B10F = 0x8C3A
RGB9_E5 = 0x8C3D
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
use ARB_depth_buffer_float FLOAT_32_UNSIGNED_INT_24_8_REV 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 use ARB_framebuffer_object UNSIGNED_INT_24_8
GetTextureParameter enum: GetTextureParameter enum:
TEXTURE_SHARED_SIZE = 0x8C3F
use ARB_framebuffer_object TEXTURE_STENCIL_SIZE use ARB_framebuffer_object TEXTURE_STENCIL_SIZE
use ARB_framebuffer_object TEXTURE_RED_TYPE use ARB_framebuffer_object TEXTURE_RED_TYPE
use ARB_framebuffer_object TEXTURE_GREEN_TYPE use ARB_framebuffer_object TEXTURE_GREEN_TYPE
@ -6444,4 +6441,37 @@ GetPName enum:
MIN_PROGRAM_TEXEL_OFFSET = 0x8904 MIN_PROGRAM_TEXEL_OFFSET = 0x8904
MAX_PROGRAM_TEXEL_OFFSET = 0x8905 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!) # End (don't remove, or the last token may be missed!)

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

@ -7851,7 +7851,7 @@ ClearBufferfi(buffer, drawbuffer, depth, stencil)
GetStringi(name, index) GetStringi(name, index)
return String return String
param name GLenum in value param name IndexedStringName in value
param index UInt32 in value param index UInt32 in value
category VERSION_3_0 category VERSION_3_0
version 3.0 version 3.0

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

@ -52912,13 +52912,13 @@ namespace OpenTK.Graphics
[System.CLSCompliant(false)] [System.CLSCompliant(false)]
[AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetStringi")] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetStringi")]
public static public static
string GetString(OpenTK.Graphics.Version30 name, UInt32 index) string GetString(OpenTK.Graphics.IndexedStringName name, UInt32 index)
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
{ {
#endif #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 #if DEBUG
} }
#endif #endif
@ -52935,13 +52935,13 @@ namespace OpenTK.Graphics
/// </param> /// </param>
[AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetStringi")] [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetStringi")]
public static public static
string GetString(OpenTK.Graphics.Version30 name, Int32 index) string GetString(OpenTK.Graphics.IndexedStringName name, Int32 index)
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
{ {
#endif #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 #if DEBUG
} }
#endif #endif

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

@ -1957,7 +1957,7 @@ namespace OpenTK.Graphics
internal extern static void ClearBufferfi(OpenTK.Graphics.Version30 buffer, Int32 drawbuffer, Single depth, Int32 stencil); internal extern static void ClearBufferfi(OpenTK.Graphics.Version30 buffer, Int32 drawbuffer, Single depth, Int32 stencil);
[System.Security.SuppressUnmanagedCodeSecurity()] [System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetStringi", ExactSpelling = true)] [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.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glIsRenderbuffer", ExactSpelling = true)] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glIsRenderbuffer", ExactSpelling = true)]
internal extern static bool IsRenderbuffer(UInt32 renderbuffer); internal extern static bool IsRenderbuffer(UInt32 renderbuffer);

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

@ -1958,7 +1958,7 @@ namespace OpenTK.Graphics
internal delegate void ClearBufferfi(OpenTK.Graphics.Version30 buffer, Int32 drawbuffer, Single depth, Int32 stencil); internal delegate void ClearBufferfi(OpenTK.Graphics.Version30 buffer, Int32 drawbuffer, Single depth, Int32 stencil);
internal static ClearBufferfi glClearBufferfi; internal static ClearBufferfi glClearBufferfi;
[System.Security.SuppressUnmanagedCodeSecurity()] [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; internal static GetStringi glGetStringi;
[System.Security.SuppressUnmanagedCodeSecurity()] [System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void ActiveTextureARB(OpenTK.Graphics.TextureUnit texture); internal delegate void ActiveTextureARB(OpenTK.Graphics.TextureUnit texture);

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

@ -929,6 +929,10 @@ namespace OpenTK.Graphics
FogOffsetValueSgix = ((int)0X8199), FogOffsetValueSgix = ((int)0X8199),
LightModelColorControl = ((int)0X81f8), LightModelColorControl = ((int)0X81f8),
SharedTexturePaletteExt = ((int)0X81fb), SharedTexturePaletteExt = ((int)0X81fb),
MajorVersion = ((int)0X821b),
MinorVersion = ((int)0X821c),
NumExtensions = ((int)0X821d),
ContextFlags = ((int)0X821e),
ConvolutionHintSgix = ((int)0X8316), ConvolutionHintSgix = ((int)0X8316),
AsyncMarkerSgix = ((int)0X8329), AsyncMarkerSgix = ((int)0X8329),
PixelTexGenModeSgix = ((int)0X832b), PixelTexGenModeSgix = ((int)0X832b),
@ -1547,6 +1551,8 @@ namespace OpenTK.Graphics
UnsignedInt8888Reversed = ((int)0X8367), UnsignedInt8888Reversed = ((int)0X8367),
UnsignedInt2101010Reversed = ((int)0X8368), UnsignedInt2101010Reversed = ((int)0X8368),
UnsignedInt248 = ((int)0X84fa), UnsignedInt248 = ((int)0X84fa),
UnsignedInt10F11F11FRev = ((int)0X8c3b),
UnsignedInt5999Rev = ((int)0X8c3e),
Float32UnsignedInt248Rev = ((int)0X8Dad), Float32UnsignedInt248Rev = ((int)0X8Dad),
} }
@ -6366,16 +6372,10 @@ namespace OpenTK.Graphics
ClipDistance3 = ((int)0X3003), ClipDistance3 = ((int)0X3003),
ClipDistance4 = ((int)0X3004), ClipDistance4 = ((int)0X3004),
ClipDistance5 = ((int)0X3005), ClipDistance5 = ((int)0X3005),
MajorVersion = ((int)0X821b),
MinorVersion = ((int)0X821c),
NumExtensions = ((int)0X821d),
ContextFlags = ((int)0X821e),
DepthBuffer = ((int)0X8223), DepthBuffer = ((int)0X8223),
StencilBuffer = ((int)0X8224), StencilBuffer = ((int)0X8224),
MaxVaryingComponents = ((int)0X8b4b), MaxVaryingComponents = ((int)0X8b4b),
UnsignedNormalized = ((int)0X8c17), UnsignedNormalized = ((int)0X8c17),
UnsignedInt10F11F11FRev = ((int)0X8c3b),
UnsignedInt5999Rev = ((int)0X8c3e),
TransformFeedbackVaryingMaxLength = ((int)0X8c76), TransformFeedbackVaryingMaxLength = ((int)0X8c76),
TransformFeedbackBufferMode = ((int)0X8c7f), TransformFeedbackBufferMode = ((int)0X8c7f),
MaxTransformFeedbackSeparateComponents = ((int)0X8c80), MaxTransformFeedbackSeparateComponents = ((int)0X8c80),
@ -9856,4 +9856,9 @@ namespace OpenTK.Graphics
UnsignedNormalized = ((int)0X8c17), UnsignedNormalized = ((int)0X8c17),
} }
public enum IndexedStringName
{
Extensions = ((int)0X1f03),
}
} }