ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-24 08:26:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

GetUniformLocation: name should have in-flow.

Browse source 
Use BlendingFunctionDest instead of BlendingFunctionDst, in order to match desktop OpenGL bindings.
This commit is contained in:
the_fiddler 2009-10-23 20:20:04 +00:00
parent bf89d0a6ab
commit 584e6c48a6
5 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/Bind/Specifications/ES20/overrides.xml
View file

@ -27,14 +27,14 @@
<function name="BlendFunc" extension="Core" version="2.0">
<param name="sfactor"><type>BlendingFactorSrc</type></param>
<param name="dfactor"><type>BlendingFactorDst</type></param>
<param name="dfactor"><type>BlendingFactorDest</type></param>
</function>
<function name="BlendFuncSeparate" extension="Core" version="2.0">
<param name="srcRGB"><type>BlendingFactorSrc</type></param>
<param name="dstRGB"><type>BlendingFactorDst</type></param>
<param name="dstRGB"><type>BlendingFactorDest</type></param>
<param name="srcAlpha"><type>BlendingFactorSrc</type></param>
<param name="dstAlpha"><type>BlendingFactorDst</type></param>
<param name="dstAlpha"><type>BlendingFactorDest</type></param>
</function>
<function name="BindBuffer" extension="Core" version="2.0">
@ -292,6 +292,10 @@
<param name="name"><flow>in</flow></param>
</function>
<function name="GetUniformLocation" extension="Core">
<param name="name"><flow>in</flow></param>
</function>
</replace>
<add>
@ -320,7 +324,7 @@
<token name="SrcAlphaSaturate" value="0X0308" remark="only valid for source RGB/Alpha" />
</enum>
<enum name="BlendingFactorDst">
<enum name="BlendingFactorDest">
<token name="Zero" value="0" />
<token name="One" value="1" />
<token name="SrcColor" value="0X0300" />

6
Source/OpenTK/Graphics/ES20/Core.cs
View file

@ -73,10 +73,10 @@ namespace OpenTK.Graphics.ES20
internal extern static void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendEquationMode modeRGB, OpenTK.Graphics.ES20.BlendEquationMode modeAlpha);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFunc", ExactSpelling = true)]
internal extern static void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDst dfactor);
internal extern static void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDest dfactor);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendFuncSeparate", ExactSpelling = true)]
internal extern static void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDst dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDst dstAlpha);
internal extern static void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDest dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDest dstAlpha);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBufferData", ExactSpelling = true)]
internal extern static void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage);
@ -346,7 +346,7 @@ namespace OpenTK.Graphics.ES20
internal extern static unsafe void GetUniformiv(UInt32 program, Int32 location, [OutAttribute] Int32* @params);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetUniformLocation", ExactSpelling = true)]
internal extern static int GetUniformLocation(UInt32 program, [OutAttribute] System.Text.StringBuilder name);
internal extern static int GetUniformLocation(UInt32 program, String name);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetVertexAttribfv", ExactSpelling = true)]
internal extern static unsafe void GetVertexAttribfv(UInt32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Single* @params);

6
Source/OpenTK/Graphics/ES20/Delegates.cs
View file

@ -71,10 +71,10 @@ namespace OpenTK.Graphics.ES20
internal delegate void BlendEquationSeparate(OpenTK.Graphics.ES20.BlendEquationMode modeRGB, OpenTK.Graphics.ES20.BlendEquationMode modeAlpha);
internal static BlendEquationSeparate glBlendEquationSeparate;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDst dfactor);
internal delegate void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDest dfactor);
internal static BlendFunc glBlendFunc;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDst dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDst dstAlpha);
internal delegate void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDest dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDest dstAlpha);
internal static BlendFuncSeparate glBlendFuncSeparate;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage);
@ -344,7 +344,7 @@ namespace OpenTK.Graphics.ES20
internal unsafe delegate void GetUniformiv(UInt32 program, Int32 location, [OutAttribute] Int32* @params);
internal unsafe static GetUniformiv glGetUniformiv;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate int GetUniformLocation(UInt32 program, [OutAttribute] System.Text.StringBuilder name);
internal delegate int GetUniformLocation(UInt32 program, String name);
internal static GetUniformLocation glGetUniformLocation;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate void GetVertexAttribfv(UInt32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Single* @params);

16
Source/OpenTK/Graphics/ES20/ES.cs
View file

@ -1659,13 +1659,13 @@ namespace OpenTK.Graphics.ES20
/// </param>
[AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBlendFunc")]
public static
void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDst dfactor)
void BlendFunc(OpenTK.Graphics.ES20.BlendingFactorSrc sfactor, OpenTK.Graphics.ES20.BlendingFactorDest dfactor)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
Delegates.glBlendFunc((OpenTK.Graphics.ES20.BlendingFactorSrc)sfactor, (OpenTK.Graphics.ES20.BlendingFactorDst)dfactor);
Delegates.glBlendFunc((OpenTK.Graphics.ES20.BlendingFactorSrc)sfactor, (OpenTK.Graphics.ES20.BlendingFactorDest)dfactor);
#if DEBUG
}
#endif
@ -1697,13 +1697,13 @@ namespace OpenTK.Graphics.ES20
/// </param>
[AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBlendFuncSeparate")]
public static
void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDst dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDst dstAlpha)
void BlendFuncSeparate(OpenTK.Graphics.ES20.BlendingFactorSrc srcRGB, OpenTK.Graphics.ES20.BlendingFactorDest dstRGB, OpenTK.Graphics.ES20.BlendingFactorSrc srcAlpha, OpenTK.Graphics.ES20.BlendingFactorDest dstAlpha)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
Delegates.glBlendFuncSeparate((OpenTK.Graphics.ES20.BlendingFactorSrc)srcRGB, (OpenTK.Graphics.ES20.BlendingFactorDst)dstRGB, (OpenTK.Graphics.ES20.BlendingFactorSrc)srcAlpha, (OpenTK.Graphics.ES20.BlendingFactorDst)dstAlpha);
Delegates.glBlendFuncSeparate((OpenTK.Graphics.ES20.BlendingFactorSrc)srcRGB, (OpenTK.Graphics.ES20.BlendingFactorDest)dstRGB, (OpenTK.Graphics.ES20.BlendingFactorSrc)srcAlpha, (OpenTK.Graphics.ES20.BlendingFactorDest)dstAlpha);
#if DEBUG
}
#endif
@ -8905,13 +8905,13 @@ namespace OpenTK.Graphics.ES20
/// </param>
[AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetUniformLocation")]
public static
int GetUniformLocation(Int32 program, [OutAttribute] System.Text.StringBuilder name)
int GetUniformLocation(Int32 program, String name)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glGetUniformLocation((UInt32)program, (System.Text.StringBuilder)name);
return Delegates.glGetUniformLocation((UInt32)program, (String)name);
#if DEBUG
}
#endif
@ -8934,13 +8934,13 @@ namespace OpenTK.Graphics.ES20
[System.CLSCompliant(false)]
[AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetUniformLocation")]
public static
int GetUniformLocation(UInt32 program, [OutAttribute] System.Text.StringBuilder name)
int GetUniformLocation(UInt32 program, String name)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glGetUniformLocation((UInt32)program, (System.Text.StringBuilder)name);
return Delegates.glGetUniformLocation((UInt32)program, (String)name);
#if DEBUG
}
#endif

12
Source/OpenTK/Graphics/ES20/Enums.cs
View file

@ -537,18 +537,6 @@ namespace OpenTK.Graphics.ES20
OneMinusSrcAlpha = ((int)0x0303),
DstAlpha = ((int)0x0304),
OneMinusDstAlpha = ((int)0x0305),
One = ((int)1),
}
public enum BlendingFactorDst : int
{
Zero = ((int)0),
SrcColor = ((int)0X0300),
OneMinusSrcColor = ((int)0X0301),
SrcAlpha = ((int)0X0302),
OneMinusSrcAlpha = ((int)0X0303),
DstAlpha = ((int)0X0304),
OneMinusDstAlpha = ((int)0X0305),
DstColor = ((int)0X0306),
OneMinusDstColor = ((int)0X0307),
SrcAlphaSaturate = ((int)0X0308),