diff --git a/Source/Bind/Specifications/GL2/gloverrides.xml b/Source/Bind/Specifications/GL2/gloverrides.xml index 7b2a52ca..1b632275 100644 --- a/Source/Bind/Specifications/GL2/gloverrides.xml +++ b/Source/Bind/Specifications/GL2/gloverrides.xml @@ -175,12 +175,11 @@ - - face + StencilFace - - func + + StencilFunction @@ -1799,6 +1798,10 @@ + + + + @@ -1809,6 +1812,10 @@ + + + + diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs index 781a330e..41157ff5 100644 --- a/Source/OpenTK/Graphics/OpenGL/GL.cs +++ b/Source/OpenTK/Graphics/OpenGL/GL.cs @@ -97597,13 +97597,13 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")] public static - void StencilFuncSeparate(OpenTK.Graphics.OpenGL.Version20 face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, Int32 mask) + void StencilFuncSeparate(OpenTK.Graphics.OpenGL.StencilFace face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, Int32 mask) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glStencilFuncSeparate((OpenTK.Graphics.OpenGL.Version20)face, (OpenTK.Graphics.OpenGL.StencilFunction)func, (Int32)@ref, (UInt32)mask); + Delegates.glStencilFuncSeparate((OpenTK.Graphics.OpenGL.StencilFace)face, (OpenTK.Graphics.OpenGL.StencilFunction)func, (Int32)@ref, (UInt32)mask); #if DEBUG } #endif @@ -97636,13 +97636,13 @@ namespace OpenTK.Graphics.OpenGL [System.CLSCompliant(false)] [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")] public static - void StencilFuncSeparate(OpenTK.Graphics.OpenGL.Version20 face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask) + void StencilFuncSeparate(OpenTK.Graphics.OpenGL.StencilFace face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - Delegates.glStencilFuncSeparate((OpenTK.Graphics.OpenGL.Version20)face, (OpenTK.Graphics.OpenGL.StencilFunction)func, (Int32)@ref, (UInt32)mask); + Delegates.glStencilFuncSeparate((OpenTK.Graphics.OpenGL.StencilFace)face, (OpenTK.Graphics.OpenGL.StencilFunction)func, (Int32)@ref, (UInt32)mask); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/OpenGL/GLCore.cs b/Source/OpenTK/Graphics/OpenGL/GLCore.cs index 5f755f43..8a842897 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLCore.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLCore.cs @@ -5477,7 +5477,7 @@ namespace OpenTK.Graphics.OpenGL internal extern static void StencilFunc(OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilFuncSeparate", ExactSpelling = true)] - internal extern static void StencilFuncSeparate(OpenTK.Graphics.OpenGL.Version20 face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask); + internal extern static void StencilFuncSeparate(OpenTK.Graphics.OpenGL.StencilFace face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glStencilFuncSeparateATI", ExactSpelling = true)] internal extern static void StencilFuncSeparateATI(OpenTK.Graphics.OpenGL.StencilFunction frontfunc, OpenTK.Graphics.OpenGL.StencilFunction backfunc, Int32 @ref, UInt32 mask); diff --git a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs index 92d4f00b..b37b6827 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLDelegates.cs @@ -5475,7 +5475,7 @@ namespace OpenTK.Graphics.OpenGL internal delegate void StencilFunc(OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask); internal static StencilFunc glStencilFunc; [System.Security.SuppressUnmanagedCodeSecurity()] - internal delegate void StencilFuncSeparate(OpenTK.Graphics.OpenGL.Version20 face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask); + internal delegate void StencilFuncSeparate(OpenTK.Graphics.OpenGL.StencilFace face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask); internal static StencilFuncSeparate glStencilFuncSeparate; [System.Security.SuppressUnmanagedCodeSecurity()] internal delegate void StencilFuncSeparateATI(OpenTK.Graphics.OpenGL.StencilFunction frontfunc, OpenTK.Graphics.OpenGL.StencilFunction backfunc, Int32 @ref, UInt32 mask); diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs index d1496092..8835edb1 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs @@ -28883,6 +28883,14 @@ namespace OpenTK.Graphics.OpenGL /// Zero = ((int)0) , /// + /// Original was GL_SRC_COLOR = 0x0300 + /// + SrcColor = ((int)0x0300) , + /// + /// Original was GL_ONE_MINUS_SRC_COLOR = 0x0301 + /// + OneMinusSrcColor = ((int)0x0301) , + /// /// Original was GL_SRC_ALPHA = 0x0302 /// SrcAlpha = ((int)0x0302) , @@ -51314,7 +51322,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.StencilMaskSeparate, GL.StencilOpSeparate + /// Used in GL.StencilFuncSeparate, GL.StencilMaskSeparate, GL.StencilOpSeparate /// public enum StencilFace : int { @@ -56444,7 +56452,7 @@ namespace OpenTK.Graphics.OpenGL } /// - /// Used in GL.StencilFuncSeparate + /// Not used directly. /// public enum Version20 : int {