Backported fix for issue [#1538] from 1.0 branch.
This commit is contained in:
parent
da7e4c7252
commit
99a3803e8a
7 changed files with 60 additions and 8 deletions
|
@ -6114,6 +6114,20 @@ APPLE_row_bytes enum:
|
||||||
#
|
#
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
# Version 1.1
|
||||||
|
|
||||||
|
ArrayCap enum:
|
||||||
|
use GetPName VERTEX_ARRAY
|
||||||
|
use GetPName NORMAL_ARRAY
|
||||||
|
use GetPName COLOR_ARRAY
|
||||||
|
SECONDARY_COLOR_ARRAY = 0x845E # 1 I
|
||||||
|
use GetPName INDEX_ARRAY
|
||||||
|
use GetPName EDGE_FLAG_ARRAY
|
||||||
|
use GetPName TEXTURE_COORD_ARRAY
|
||||||
|
FOG_COORD_ARRAY = 0x8457
|
||||||
|
|
||||||
|
|
||||||
# Version 1.2
|
# Version 1.2
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,14 @@
|
||||||
|
|
||||||
<replace>
|
<replace>
|
||||||
|
|
||||||
|
<function name="DisableClientState" extension="Core">
|
||||||
|
<param name="array"><type>ArrayCap</type></param>
|
||||||
|
</function>
|
||||||
|
|
||||||
|
<function name="EnableClientState" extension="Core">
|
||||||
|
<param name="array"><type>ArrayCap</type></param>
|
||||||
|
</function>
|
||||||
|
|
||||||
<function name="TexImage1D" extension="Core">
|
<function name="TexImage1D" extension="Core">
|
||||||
<param name="internalformat"><type>PixelInternalFormat</type></param>
|
<param name="internalformat"><type>PixelInternalFormat</type></param>
|
||||||
</function>
|
</function>
|
||||||
|
|
|
@ -36732,13 +36732,13 @@ namespace OpenTK.Graphics.OpenGL
|
||||||
|
|
||||||
[AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glDisableClientState")]
|
[AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glDisableClientState")]
|
||||||
public static
|
public static
|
||||||
void DisableClientState(OpenTK.Graphics.OpenGL.EnableCap array)
|
void DisableClientState(OpenTK.Graphics.OpenGL.ArrayCap array)
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
||||||
{
|
{
|
||||||
#endif
|
#endif
|
||||||
Delegates.glDisableClientState((OpenTK.Graphics.OpenGL.EnableCap)array);
|
Delegates.glDisableClientState((OpenTK.Graphics.OpenGL.ArrayCap)array);
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -38780,13 +38780,13 @@ namespace OpenTK.Graphics.OpenGL
|
||||||
/// </param>
|
/// </param>
|
||||||
[AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glEnableClientState")]
|
[AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glEnableClientState")]
|
||||||
public static
|
public static
|
||||||
void EnableClientState(OpenTK.Graphics.OpenGL.EnableCap array)
|
void EnableClientState(OpenTK.Graphics.OpenGL.ArrayCap array)
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
||||||
{
|
{
|
||||||
#endif
|
#endif
|
||||||
Delegates.glEnableClientState((OpenTK.Graphics.OpenGL.EnableCap)array);
|
Delegates.glEnableClientState((OpenTK.Graphics.OpenGL.ArrayCap)array);
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -983,7 +983,7 @@ namespace OpenTK.Graphics.OpenGL
|
||||||
internal extern static void Disable(OpenTK.Graphics.OpenGL.EnableCap cap);
|
internal extern static void Disable(OpenTK.Graphics.OpenGL.EnableCap cap);
|
||||||
[System.Security.SuppressUnmanagedCodeSecurity()]
|
[System.Security.SuppressUnmanagedCodeSecurity()]
|
||||||
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDisableClientState", ExactSpelling = true)]
|
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDisableClientState", ExactSpelling = true)]
|
||||||
internal extern static void DisableClientState(OpenTK.Graphics.OpenGL.EnableCap array);
|
internal extern static void DisableClientState(OpenTK.Graphics.OpenGL.ArrayCap array);
|
||||||
[System.Security.SuppressUnmanagedCodeSecurity()]
|
[System.Security.SuppressUnmanagedCodeSecurity()]
|
||||||
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDisableClientStateIndexedEXT", ExactSpelling = true)]
|
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glDisableClientStateIndexedEXT", ExactSpelling = true)]
|
||||||
internal extern static void DisableClientStateIndexedEXT(OpenTK.Graphics.OpenGL.EnableCap array, UInt32 index);
|
internal extern static void DisableClientStateIndexedEXT(OpenTK.Graphics.OpenGL.EnableCap array, UInt32 index);
|
||||||
|
@ -1106,7 +1106,7 @@ namespace OpenTK.Graphics.OpenGL
|
||||||
internal extern static void Enable(OpenTK.Graphics.OpenGL.EnableCap cap);
|
internal extern static void Enable(OpenTK.Graphics.OpenGL.EnableCap cap);
|
||||||
[System.Security.SuppressUnmanagedCodeSecurity()]
|
[System.Security.SuppressUnmanagedCodeSecurity()]
|
||||||
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEnableClientState", ExactSpelling = true)]
|
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEnableClientState", ExactSpelling = true)]
|
||||||
internal extern static void EnableClientState(OpenTK.Graphics.OpenGL.EnableCap array);
|
internal extern static void EnableClientState(OpenTK.Graphics.OpenGL.ArrayCap array);
|
||||||
[System.Security.SuppressUnmanagedCodeSecurity()]
|
[System.Security.SuppressUnmanagedCodeSecurity()]
|
||||||
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEnableClientStateIndexedEXT", ExactSpelling = true)]
|
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glEnableClientStateIndexedEXT", ExactSpelling = true)]
|
||||||
internal extern static void EnableClientStateIndexedEXT(OpenTK.Graphics.OpenGL.EnableCap array, UInt32 index);
|
internal extern static void EnableClientStateIndexedEXT(OpenTK.Graphics.OpenGL.EnableCap array, UInt32 index);
|
||||||
|
|
|
@ -981,7 +981,7 @@ namespace OpenTK.Graphics.OpenGL
|
||||||
internal delegate void Disable(OpenTK.Graphics.OpenGL.EnableCap cap);
|
internal delegate void Disable(OpenTK.Graphics.OpenGL.EnableCap cap);
|
||||||
internal static Disable glDisable;
|
internal static Disable glDisable;
|
||||||
[System.Security.SuppressUnmanagedCodeSecurity()]
|
[System.Security.SuppressUnmanagedCodeSecurity()]
|
||||||
internal delegate void DisableClientState(OpenTK.Graphics.OpenGL.EnableCap array);
|
internal delegate void DisableClientState(OpenTK.Graphics.OpenGL.ArrayCap array);
|
||||||
internal static DisableClientState glDisableClientState;
|
internal static DisableClientState glDisableClientState;
|
||||||
[System.Security.SuppressUnmanagedCodeSecurity()]
|
[System.Security.SuppressUnmanagedCodeSecurity()]
|
||||||
internal delegate void DisableClientStateIndexedEXT(OpenTK.Graphics.OpenGL.EnableCap array, UInt32 index);
|
internal delegate void DisableClientStateIndexedEXT(OpenTK.Graphics.OpenGL.EnableCap array, UInt32 index);
|
||||||
|
@ -1104,7 +1104,7 @@ namespace OpenTK.Graphics.OpenGL
|
||||||
internal delegate void Enable(OpenTK.Graphics.OpenGL.EnableCap cap);
|
internal delegate void Enable(OpenTK.Graphics.OpenGL.EnableCap cap);
|
||||||
internal static Enable glEnable;
|
internal static Enable glEnable;
|
||||||
[System.Security.SuppressUnmanagedCodeSecurity()]
|
[System.Security.SuppressUnmanagedCodeSecurity()]
|
||||||
internal delegate void EnableClientState(OpenTK.Graphics.OpenGL.EnableCap array);
|
internal delegate void EnableClientState(OpenTK.Graphics.OpenGL.ArrayCap array);
|
||||||
internal static EnableClientState glEnableClientState;
|
internal static EnableClientState glEnableClientState;
|
||||||
[System.Security.SuppressUnmanagedCodeSecurity()]
|
[System.Security.SuppressUnmanagedCodeSecurity()]
|
||||||
internal delegate void EnableClientStateIndexedEXT(OpenTK.Graphics.OpenGL.EnableCap array, UInt32 index);
|
internal delegate void EnableClientStateIndexedEXT(OpenTK.Graphics.OpenGL.EnableCap array, UInt32 index);
|
||||||
|
|
|
@ -4821,6 +4821,18 @@ namespace OpenTK.Graphics.OpenGL
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum ArrayCap : int
|
||||||
|
{
|
||||||
|
VertexArray = ((int)0x8074),
|
||||||
|
NormalArray = ((int)0x8075),
|
||||||
|
ColorArray = ((int)0x8076),
|
||||||
|
IndexArray = ((int)0x8077),
|
||||||
|
TextureCoordArray = ((int)0x8078),
|
||||||
|
EdgeFlagArray = ((int)0x8079),
|
||||||
|
FogCoordArray = ((int)0x8457),
|
||||||
|
SecondaryColorArray = ((int)0x845E),
|
||||||
|
}
|
||||||
|
|
||||||
public enum AssemblyProgramFormatArb : int
|
public enum AssemblyProgramFormatArb : int
|
||||||
{
|
{
|
||||||
ProgramFormatAsciiArb = ((int)0x8875),
|
ProgramFormatAsciiArb = ((int)0x8875),
|
||||||
|
|
|
@ -874,6 +874,24 @@ namespace OpenTK.Graphics.OpenGL
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region Obsolete
|
||||||
|
|
||||||
|
[AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glDisableClientState")]
|
||||||
|
[Obsolete("Use DisableClientState(ArrayCap) instead.")]
|
||||||
|
public static void DisableClientState(OpenTK.Graphics.OpenGL.EnableCap array)
|
||||||
|
{
|
||||||
|
DisableClientState((ArrayCap)array);
|
||||||
|
}
|
||||||
|
|
||||||
|
[AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glEnableClientState")]
|
||||||
|
[Obsolete("Use EnableClientState(ArrayCap) instead.")]
|
||||||
|
public static void EnableClientState(OpenTK.Graphics.OpenGL.EnableCap array)
|
||||||
|
{
|
||||||
|
EnableClientState((ArrayCap)array);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
#pragma warning restore 3019
|
#pragma warning restore 3019
|
||||||
#pragma warning restore 1591
|
#pragma warning restore 1591
|
||||||
#pragma warning restore 1572
|
#pragma warning restore 1572
|
||||||
|
|
Loading…
Reference in a new issue