ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Strongly-typed enums for ES 3.0 (WIP7)

Browse source 
Implemented section: Sync Objects and Fences [5.2].
Fixed desktop OpenGL wrapper for ClientWaitSync and FenceSync.
This commit is contained in:
Stefanos A 2013-11-05 09:53:34 +01:00
parent ad1755f58e
commit 167c97dd84
13 changed files with 170 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Source/Bind/Specifications/GL2/overrides.xml
View file

@ -1593,12 +1593,15 @@
<param name="condition">
<type>SyncCondition</type>
</param>
<param name="flags">
<type>WaitSyncFlags</type>
</param>
</function>
<function name="ClientWaitSync" extension="Core">
<returns>WaitSyncStatus</returns>
<param name="flags">
<type>WaitSyncFlags</type>
<type>ClientWaitSyncFlags</type>
</param>
</function>
@ -3664,10 +3667,13 @@
<enum name="SyncCondition">
<use enum="VERSION_4_1" token="SYNC_GPU_COMMANDS_COMPLETE" />
</enum>
<enum name="WaitSyncFlags">
<enum name="ClientWaitSyncFlags">
<use enum="VERSION_1_1" token="NONE" />
<use enum="VERSION_4_1" token="SYNC_FLUSH_COMMANDS_BIT" />
</enum>
<enum name="WaitSyncFlags">
<use enum="VERSION_1_1" token="NONE" />
</enum>
<enum name="WaitSyncStatus">
<use enum="VERSION_3_2" token="ALREADY_SIGNALED" />
<use enum="VERSION_3_2" token="TIMEOUT_EXPIRED" />
@ -5304,6 +5310,19 @@
<param name="buffer"><type>ClearBufferCombined</type></param>
</function>
<!-- Sync Objects and Fences [5.2] -->
<function name="FenceSync">
<param name="condition"><type>SyncCondition</type></param>
<param name="flags"><type>WaitSyncFlags</type></param>
</function>
<function name="ClientWaitSync" extension="Core">
<returns>WaitSyncStatus</returns>
<param name="flags"><type>ClientWaitSyncFlags</type></param>
</function>
<function name="WaitSync" extension="Core">
<param name="flags"><type>WaitSyncFlags</type></param>
</function>
</replace>
<add name="gles2" version="3.0">
@ -5478,6 +5497,10 @@
<enum name="ClearBufferCombined">
<use token="DEPTH_STENCIL" />
</enum>
<enum name="ClientWaitSyncFlags">
<use token="NONE" />
<use token="SYNC_FLUSH_COMMANDS_BIT" />
</enum>
<enum name="CompressedInternalFormat">
<use token="COMPRESSED_R11_EAC" />
<use token="COMPRESSED_SIGNED_R11_EAC" />
@ -5737,6 +5760,9 @@
<use token="INCR_WRAP" />
<use token="DECR_WRAP" />
</enum>
<enum name="SyncCondition">
<use token="SYNC_GPU_COMMANDS_COMPLETE" />
</enum>
<enum name="TextureComponentCount">
<reuse enum="SizedInternalFormat" />
<use token="RGB" />
@ -5941,6 +5967,15 @@
<use token="INT_2_10_10_10_REV" />
<use token="UNSIGNED_INT_2_10_10_10_REV" />
</enum>
<enum name="WaitSyncFlags">
<use token="NONE" />
</enum>
<enum name="WaitSyncStatus">
<use token="ALREADY_SIGNALED" />
<use token="TIMEOUT_EXPIRED" />
<use token="CONDITION_SATISFIED" />
<use token="WAIT_FAILED" />
</enum>
</add>

82
Source/OpenTK/Graphics/ES30/ES30.cs
View file

@ -1930,42 +1930,13 @@ namespace OpenTK.Graphics.ES30
/// </param>
[AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glFenceSyncAPPLE")]
public static
IntPtr FenceSync(OpenTK.Graphics.ES30.All condition, Int32 flags)
IntPtr FenceSync(OpenTK.Graphics.ES30.SyncCondition condition, OpenTK.Graphics.ES30.WaitSyncFlags flags)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glFenceSyncAPPLE((OpenTK.Graphics.ES30.All)condition, (UInt32)flags);
#if DEBUG
}
#endif
}
/// <summary>[requires: APPLE_sync]
/// Create a new sync object and insert it into the GL command stream
/// </summary>
/// <param name="condition">
/// <para>
/// Specifies the condition that must be met to set the sync object's state to signaled. condition must be GL_SYNC_GPU_COMMANDS_COMPLETE.
/// </para>
/// </param>
/// <param name="flags">
/// <para>
/// Specifies a bitwise combination of flags controlling the behavior of the sync object. No flags are presently defined for this operation and flags must be zero. flags is a placeholder for anticipated future extensions of fence sync object capabilities.
/// </para>
/// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glFenceSyncAPPLE")]
public static
IntPtr FenceSync(OpenTK.Graphics.ES30.All condition, UInt32 flags)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glFenceSyncAPPLE((OpenTK.Graphics.ES30.All)condition, (UInt32)flags);
return Delegates.glFenceSyncAPPLE((OpenTK.Graphics.ES30.SyncCondition)condition, (OpenTK.Graphics.ES30.WaitSyncFlags)flags);
#if DEBUG
}
#endif
@ -4355,13 +4326,13 @@ namespace OpenTK.Graphics.ES30
/// </param>
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glClientWaitSync")]
public static
OpenTK.Graphics.ES30.All ClientWaitSync(IntPtr sync, Int32 flags, Int64 timeout)
OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, Int64 timeout)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glClientWaitSync((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.ES30.ClientWaitSyncFlags)flags, (UInt64)timeout);
#if DEBUG
}
#endif
@ -4389,13 +4360,13 @@ namespace OpenTK.Graphics.ES30
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glClientWaitSync")]
public static
OpenTK.Graphics.ES30.All ClientWaitSync(IntPtr sync, UInt32 flags, UInt64 timeout)
OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, UInt64 timeout)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glClientWaitSync((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.ES30.ClientWaitSyncFlags)flags, (UInt64)timeout);
#if DEBUG
}
#endif
@ -9934,42 +9905,13 @@ namespace OpenTK.Graphics.ES30
/// </param>
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glFenceSync")]
public static
IntPtr FenceSync(OpenTK.Graphics.ES30.All condition, Int32 flags)
IntPtr FenceSync(OpenTK.Graphics.ES30.SyncCondition condition, OpenTK.Graphics.ES30.WaitSyncFlags flags)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glFenceSync((OpenTK.Graphics.ES30.All)condition, (UInt32)flags);
#if DEBUG
}
#endif
}
/// <summary>[requires: v3.0 and ES_VERSION_3_0]
/// Create a new sync object and insert it into the GL command stream
/// </summary>
/// <param name="condition">
/// <para>
/// Specifies the condition that must be met to set the sync object's state to signaled. condition must be GL_SYNC_GPU_COMMANDS_COMPLETE.
/// </para>
/// </param>
/// <param name="flags">
/// <para>
/// Specifies a bitwise combination of flags controlling the behavior of the sync object. No flags are presently defined for this operation and flags must be zero. flags is a placeholder for anticipated future extensions of fence sync object capabilities.
/// </para>
/// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glFenceSync")]
public static
IntPtr FenceSync(OpenTK.Graphics.ES30.All condition, UInt32 flags)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glFenceSync((OpenTK.Graphics.ES30.All)condition, (UInt32)flags);
return Delegates.glFenceSync((OpenTK.Graphics.ES30.SyncCondition)condition, (OpenTK.Graphics.ES30.WaitSyncFlags)flags);
#if DEBUG
}
#endif
@ -34568,13 +34510,13 @@ namespace OpenTK.Graphics.ES30
/// </param>
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glWaitSync")]
public static
void WaitSync(IntPtr sync, Int32 flags, Int64 timeout)
void WaitSync(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, Int64 timeout)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
Delegates.glWaitSync((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
Delegates.glWaitSync((IntPtr)sync, (OpenTK.Graphics.ES30.WaitSyncFlags)flags, (UInt64)timeout);
#if DEBUG
}
#endif
@ -34602,13 +34544,13 @@ namespace OpenTK.Graphics.ES30
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glWaitSync")]
public static
void WaitSync(IntPtr sync, UInt32 flags, UInt64 timeout)
void WaitSync(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, UInt64 timeout)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
Delegates.glWaitSync((IntPtr)sync, (UInt32)flags, (UInt64)timeout);
Delegates.glWaitSync((IntPtr)sync, (OpenTK.Graphics.ES30.WaitSyncFlags)flags, (UInt64)timeout);
#if DEBUG
}
#endif

8
Source/OpenTK/Graphics/ES30/ES30Delegates.cs
View file

@ -168,7 +168,7 @@ namespace OpenTK.Graphics.ES30
internal delegate void ClearStencil(Int32 s);
internal static ClearStencil glClearStencil;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate OpenTK.Graphics.ES30.All ClientWaitSync(IntPtr sync, UInt32 flags, UInt64 timeout);
internal delegate OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, UInt64 timeout);
internal static ClientWaitSync glClientWaitSync;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate OpenTK.Graphics.ES30.All ClientWaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
@ -444,10 +444,10 @@ namespace OpenTK.Graphics.ES30
internal delegate void ExtTexObjectStateOverrideiQCOM(OpenTK.Graphics.ES30.All target, OpenTK.Graphics.ES30.All pname, Int32 param);
internal static ExtTexObjectStateOverrideiQCOM glExtTexObjectStateOverrideiQCOM;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate IntPtr FenceSync(OpenTK.Graphics.ES30.All condition, UInt32 flags);
internal delegate IntPtr FenceSync(OpenTK.Graphics.ES30.SyncCondition condition, OpenTK.Graphics.ES30.WaitSyncFlags flags);
internal static FenceSync glFenceSync;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate IntPtr FenceSyncAPPLE(OpenTK.Graphics.ES30.All condition, UInt32 flags);
internal delegate IntPtr FenceSyncAPPLE(OpenTK.Graphics.ES30.SyncCondition condition, OpenTK.Graphics.ES30.WaitSyncFlags flags);
internal static FenceSyncAPPLE glFenceSyncAPPLE;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void Finish();
@ -1371,7 +1371,7 @@ namespace OpenTK.Graphics.ES30
internal delegate void Viewport(Int32 x, Int32 y, Int32 width, Int32 height);
internal static Viewport glViewport;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void WaitSync(IntPtr sync, UInt32 flags, UInt64 timeout);
internal delegate void WaitSync(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, UInt64 timeout);
internal static WaitSync glWaitSync;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void WaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);

62
Source/OpenTK/Graphics/ES30/ES30Enums.cs
View file

@ -385,7 +385,7 @@ namespace OpenTK.Graphics.ES30
}
/// <summary>
/// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 76 other functions
/// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 74 other functions
/// </summary>
public enum All : int
{
@ -9748,6 +9748,21 @@ namespace OpenTK.Graphics.ES30
ClientAllAttribBits = unchecked((int)0xFFFFFFFF) ,
}
/// <summary>
/// Used in GL.ClientWaitSync
/// </summary>
public enum ClientWaitSyncFlags : int
{
/// <summary>
/// Original was GL_NONE = 0
/// </summary>
None = ((int)0) ,
/// <summary>
/// Original was GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001
/// </summary>
SyncFlushCommandsBit = ((int)0x00000001) ,
}
/// <summary>
/// Not used directly.
/// </summary>
@ -22520,6 +22535,17 @@ namespace OpenTK.Graphics.ES30
ShadingLanguageVersion = ((int)0X8b8c) ,
}
/// <summary>
/// Used in GL.Apple.FenceSync, GL.FenceSync
/// </summary>
public enum SyncCondition : int
{
/// <summary>
/// Original was GL_SYNC_GPU_COMMANDS_COMPLETE = 0x9117
/// </summary>
SyncGpuCommandsComplete = ((int)0x9117) ,
}
/// <summary>
/// Not used directly.
/// </summary>
@ -24172,4 +24198,38 @@ namespace OpenTK.Graphics.ES30
ShaderBinaryViv = ((int)0x8FC4) ,
}
/// <summary>
/// Used in GL.Apple.FenceSync, GL.FenceSync and 1 other function
/// </summary>
public enum WaitSyncFlags : int
{
/// <summary>
/// Original was GL_NONE = 0
/// </summary>
None = ((int)0) ,
}
/// <summary>
/// Not used directly.
/// </summary>
public enum WaitSyncStatus : int
{
/// <summary>
/// Original was GL_ALREADY_SIGNALED = 0x911A
/// </summary>
AlreadySignaled = ((int)0x911A) ,
/// <summary>
/// Original was GL_TIMEOUT_EXPIRED = 0x911B
/// </summary>
TimeoutExpired = ((int)0x911B) ,
/// <summary>
/// Original was GL_CONDITION_SATISFIED = 0x911C
/// </summary>
ConditionSatisfied = ((int)0x911C) ,
/// <summary>
/// Original was GL_WAIT_FAILED = 0x911D
/// </summary>
WaitFailed = ((int)0x911D) ,
}
}

8
Source/OpenTK/Graphics/ES30/ES3Core.cs
View file

@ -170,7 +170,7 @@ namespace OpenTK.Graphics.ES30
internal extern static void ClearStencil(Int32 s);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClientWaitSync", ExactSpelling = true)]
internal extern static OpenTK.Graphics.ES30.All ClientWaitSync(IntPtr sync, UInt32 flags, UInt64 timeout);
internal extern static OpenTK.Graphics.ES30.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES30.ClientWaitSyncFlags flags, UInt64 timeout);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClientWaitSyncAPPLE", ExactSpelling = true)]
internal extern static OpenTK.Graphics.ES30.All ClientWaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);
@ -446,10 +446,10 @@ namespace OpenTK.Graphics.ES30
internal extern static void ExtTexObjectStateOverrideiQCOM(OpenTK.Graphics.ES30.All target, OpenTK.Graphics.ES30.All pname, Int32 param);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFenceSync", ExactSpelling = true)]
internal extern static IntPtr FenceSync(OpenTK.Graphics.ES30.All condition, UInt32 flags);
internal extern static IntPtr FenceSync(OpenTK.Graphics.ES30.SyncCondition condition, OpenTK.Graphics.ES30.WaitSyncFlags flags);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFenceSyncAPPLE", ExactSpelling = true)]
internal extern static IntPtr FenceSyncAPPLE(OpenTK.Graphics.ES30.All condition, UInt32 flags);
internal extern static IntPtr FenceSyncAPPLE(OpenTK.Graphics.ES30.SyncCondition condition, OpenTK.Graphics.ES30.WaitSyncFlags flags);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFinish", ExactSpelling = true)]
internal extern static void Finish();
@ -1373,7 +1373,7 @@ namespace OpenTK.Graphics.ES30
internal extern static void Viewport(Int32 x, Int32 y, Int32 width, Int32 height);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glWaitSync", ExactSpelling = true)]
internal extern static void WaitSync(IntPtr sync, UInt32 flags, UInt64 timeout);
internal extern static void WaitSync(IntPtr sync, OpenTK.Graphics.ES30.WaitSyncFlags flags, UInt64 timeout);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glWaitSyncAPPLE", ExactSpelling = true)]
internal extern static void WaitSyncAPPLE(IntPtr sync, UInt32 flags, UInt64 timeout);

41
Source/OpenTK/Graphics/OpenGL/GL.cs
View file

@ -44447,13 +44447,13 @@ namespace OpenTK.Graphics.OpenGL
/// </param>
[AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glClientWaitSync")]
public static
OpenTK.Graphics.OpenGL.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL.WaitSyncFlags flags, Int64 timeout)
OpenTK.Graphics.OpenGL.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL.ClientWaitSyncFlags flags, Int64 timeout)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL.WaitSyncFlags)flags, (UInt64)timeout);
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL.ClientWaitSyncFlags)flags, (UInt64)timeout);
#if DEBUG
}
#endif
@ -44481,13 +44481,13 @@ namespace OpenTK.Graphics.OpenGL
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glClientWaitSync")]
public static
OpenTK.Graphics.OpenGL.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL.WaitSyncFlags flags, UInt64 timeout)
OpenTK.Graphics.OpenGL.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL.ClientWaitSyncFlags flags, UInt64 timeout)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL.WaitSyncFlags)flags, (UInt64)timeout);
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL.ClientWaitSyncFlags)flags, (UInt64)timeout);
#if DEBUG
}
#endif
@ -62474,42 +62474,13 @@ namespace OpenTK.Graphics.OpenGL
/// </param>
[AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glFenceSync")]
public static
IntPtr FenceSync(OpenTK.Graphics.OpenGL.SyncCondition condition, Int32 flags)
IntPtr FenceSync(OpenTK.Graphics.OpenGL.SyncCondition condition, OpenTK.Graphics.OpenGL.WaitSyncFlags flags)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glFenceSync((OpenTK.Graphics.OpenGL.SyncCondition)condition, (UInt32)flags);
#if DEBUG
}
#endif
}
/// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
/// Create a new sync object and insert it into the GL command stream
/// </summary>
/// <param name="condition">
/// <para>
/// Specifies the condition that must be met to set the sync object's state to signaled. condition must be GL_SYNC_GPU_COMMANDS_COMPLETE.
/// </para>
/// </param>
/// <param name="flags">
/// <para>
/// Specifies a bitwise combination of flags controlling the behavior of the sync object. No flags are presently defined for this operation and flags must be zero. flags is a placeholder for anticipated future extensions of fence sync object capabilities.
/// </para>
/// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glFenceSync")]
public static
IntPtr FenceSync(OpenTK.Graphics.OpenGL.SyncCondition condition, UInt32 flags)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glFenceSync((OpenTK.Graphics.OpenGL.SyncCondition)condition, (UInt32)flags);
return Delegates.glFenceSync((OpenTK.Graphics.OpenGL.SyncCondition)condition, (OpenTK.Graphics.OpenGL.WaitSyncFlags)flags);
#if DEBUG
}
#endif

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

@ -554,7 +554,7 @@ namespace OpenTK.Graphics.OpenGL
internal extern static void ClientAttribDefaultEXT(OpenTK.Graphics.OpenGL.ClientAttribMask mask);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClientWaitSync", ExactSpelling = true)]
internal extern static OpenTK.Graphics.OpenGL.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL.WaitSyncFlags flags, UInt64 timeout);
internal extern static OpenTK.Graphics.OpenGL.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL.ClientWaitSyncFlags flags, UInt64 timeout);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClipPlane", ExactSpelling = true)]
internal extern static unsafe void ClipPlane(OpenTK.Graphics.OpenGL.ClipPlaneName plane, Double* equation);
@ -1619,7 +1619,7 @@ namespace OpenTK.Graphics.OpenGL
internal extern static unsafe void FeedbackBufferxOES(Int32 n, OpenTK.Graphics.OpenGL.OesFixedPoint type, int* buffer);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFenceSync", ExactSpelling = true)]
internal extern static IntPtr FenceSync(OpenTK.Graphics.OpenGL.SyncCondition condition, UInt32 flags);
internal extern static IntPtr FenceSync(OpenTK.Graphics.OpenGL.SyncCondition condition, OpenTK.Graphics.OpenGL.WaitSyncFlags flags);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFinalCombinerInputNV", ExactSpelling = true)]
internal extern static void FinalCombinerInputNV(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners input, OpenTK.Graphics.OpenGL.NvRegisterCombiners mapping, OpenTK.Graphics.OpenGL.NvRegisterCombiners componentUsage);

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

@ -552,7 +552,7 @@ namespace OpenTK.Graphics.OpenGL
internal delegate void ClientAttribDefaultEXT(OpenTK.Graphics.OpenGL.ClientAttribMask mask);
internal static ClientAttribDefaultEXT glClientAttribDefaultEXT;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate OpenTK.Graphics.OpenGL.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL.WaitSyncFlags flags, UInt64 timeout);
internal delegate OpenTK.Graphics.OpenGL.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL.ClientWaitSyncFlags flags, UInt64 timeout);
internal static ClientWaitSync glClientWaitSync;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal unsafe delegate void ClipPlane(OpenTK.Graphics.OpenGL.ClipPlaneName plane, Double* equation);
@ -1617,7 +1617,7 @@ namespace OpenTK.Graphics.OpenGL
internal unsafe delegate void FeedbackBufferxOES(Int32 n, OpenTK.Graphics.OpenGL.OesFixedPoint type, int* buffer);
internal unsafe static FeedbackBufferxOES glFeedbackBufferxOES;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate IntPtr FenceSync(OpenTK.Graphics.OpenGL.SyncCondition condition, UInt32 flags);
internal delegate IntPtr FenceSync(OpenTK.Graphics.OpenGL.SyncCondition condition, OpenTK.Graphics.OpenGL.WaitSyncFlags flags);
internal static FenceSync glFenceSync;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void FinalCombinerInputNV(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners input, OpenTK.Graphics.OpenGL.NvRegisterCombiners mapping, OpenTK.Graphics.OpenGL.NvRegisterCombiners componentUsage);

21
Source/OpenTK/Graphics/OpenGL/GLEnums.cs
View file

@ -28832,6 +28832,21 @@ namespace OpenTK.Graphics.OpenGL
ClientAllAttribBits = unchecked((int)0xFFFFFFFF) ,
}
/// <summary>
/// Used in GL.ClientWaitSync
/// </summary>
public enum ClientWaitSyncFlags : int
{
/// <summary>
/// Original was GL_NONE = 0
/// </summary>
None = ((int)0) ,
/// <summary>
/// Original was GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001
/// </summary>
SyncFlushCommandsBit = ((int)0x00000001) ,
}
/// <summary>
/// Used in GL.ClipPlane, GL.GetClipPlane
/// </summary>
@ -59374,7 +59389,7 @@ namespace OpenTK.Graphics.OpenGL
}
/// <summary>
/// Used in GL.ClientWaitSync, GL.WaitSync
/// Used in GL.FenceSync, GL.WaitSync
/// </summary>
public enum WaitSyncFlags : int
{
@ -59382,10 +59397,6 @@ namespace OpenTK.Graphics.OpenGL
/// Original was GL_NONE = 0
/// </summary>
None = ((int)0) ,
/// <summary>
/// Original was GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001
/// </summary>
SyncFlushCommandsBit = ((int)0x00000001) ,
}
/// <summary>

41
Source/OpenTK/Graphics/OpenGL4/GL4.cs
View file

@ -11135,13 +11135,13 @@ namespace OpenTK.Graphics.OpenGL4
/// </param>
[AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glClientWaitSync")]
public static
OpenTK.Graphics.OpenGL4.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL4.WaitSyncFlags flags, Int64 timeout)
OpenTK.Graphics.OpenGL4.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL4.ClientWaitSyncFlags flags, Int64 timeout)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL4.WaitSyncFlags)flags, (UInt64)timeout);
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL4.ClientWaitSyncFlags)flags, (UInt64)timeout);
#if DEBUG
}
#endif
@ -11169,13 +11169,13 @@ namespace OpenTK.Graphics.OpenGL4
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glClientWaitSync")]
public static
OpenTK.Graphics.OpenGL4.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL4.WaitSyncFlags flags, UInt64 timeout)
OpenTK.Graphics.OpenGL4.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL4.ClientWaitSyncFlags flags, UInt64 timeout)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL4.WaitSyncFlags)flags, (UInt64)timeout);
return Delegates.glClientWaitSync((IntPtr)sync, (OpenTK.Graphics.OpenGL4.ClientWaitSyncFlags)flags, (UInt64)timeout);
#if DEBUG
}
#endif
@ -23355,42 +23355,13 @@ namespace OpenTK.Graphics.OpenGL4
/// </param>
[AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glFenceSync")]
public static
IntPtr FenceSync(OpenTK.Graphics.OpenGL4.SyncCondition condition, Int32 flags)
IntPtr FenceSync(OpenTK.Graphics.OpenGL4.SyncCondition condition, OpenTK.Graphics.OpenGL4.WaitSyncFlags flags)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glFenceSync((OpenTK.Graphics.OpenGL4.SyncCondition)condition, (UInt32)flags);
#if DEBUG
}
#endif
}
/// <summary>[requires: v3.2 and ARB_sync|VERSION_3_2]
/// Create a new sync object and insert it into the GL command stream
/// </summary>
/// <param name="condition">
/// <para>
/// Specifies the condition that must be met to set the sync object's state to signaled. condition must be GL_SYNC_GPU_COMMANDS_COMPLETE.
/// </para>
/// </param>
/// <param name="flags">
/// <para>
/// Specifies a bitwise combination of flags controlling the behavior of the sync object. No flags are presently defined for this operation and flags must be zero. flags is a placeholder for anticipated future extensions of fence sync object capabilities.
/// </para>
/// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_sync|VERSION_3_2", Version = "3.2", EntryPoint = "glFenceSync")]
public static
IntPtr FenceSync(OpenTK.Graphics.OpenGL4.SyncCondition condition, UInt32 flags)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
return Delegates.glFenceSync((OpenTK.Graphics.OpenGL4.SyncCondition)condition, (UInt32)flags);
return Delegates.glFenceSync((OpenTK.Graphics.OpenGL4.SyncCondition)condition, (OpenTK.Graphics.OpenGL4.WaitSyncFlags)flags);
#if DEBUG
}
#endif

4
Source/OpenTK/Graphics/OpenGL4/GL4Core.cs
View file

@ -221,7 +221,7 @@ namespace OpenTK.Graphics.OpenGL4
internal extern static void ClearTexSubImage(UInt32 texture, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, IntPtr data);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glClientWaitSync", ExactSpelling = true)]
internal extern static OpenTK.Graphics.OpenGL4.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL4.WaitSyncFlags flags, UInt64 timeout);
internal extern static OpenTK.Graphics.OpenGL4.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL4.ClientWaitSyncFlags flags, UInt64 timeout);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glColorMask", ExactSpelling = true)]
internal extern static void ColorMask(bool red, bool green, bool blue, bool alpha);
@ -527,7 +527,7 @@ namespace OpenTK.Graphics.OpenGL4
internal extern static void EndTransformFeedback();
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFenceSync", ExactSpelling = true)]
internal extern static IntPtr FenceSync(OpenTK.Graphics.OpenGL4.SyncCondition condition, UInt32 flags);
internal extern static IntPtr FenceSync(OpenTK.Graphics.OpenGL4.SyncCondition condition, OpenTK.Graphics.OpenGL4.WaitSyncFlags flags);
[System.Security.SuppressUnmanagedCodeSecurity()]
[System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glFinish", ExactSpelling = true)]
internal extern static void Finish();

4
Source/OpenTK/Graphics/OpenGL4/GL4Delegates.cs
View file

@ -219,7 +219,7 @@ namespace OpenTK.Graphics.OpenGL4
internal delegate void ClearTexSubImage(UInt32 texture, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, IntPtr data);
internal static ClearTexSubImage glClearTexSubImage;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate OpenTK.Graphics.OpenGL4.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL4.WaitSyncFlags flags, UInt64 timeout);
internal delegate OpenTK.Graphics.OpenGL4.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.OpenGL4.ClientWaitSyncFlags flags, UInt64 timeout);
internal static ClientWaitSync glClientWaitSync;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void ColorMask(bool red, bool green, bool blue, bool alpha);
@ -525,7 +525,7 @@ namespace OpenTK.Graphics.OpenGL4
internal delegate void EndTransformFeedback();
internal static EndTransformFeedback glEndTransformFeedback;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate IntPtr FenceSync(OpenTK.Graphics.OpenGL4.SyncCondition condition, UInt32 flags);
internal delegate IntPtr FenceSync(OpenTK.Graphics.OpenGL4.SyncCondition condition, OpenTK.Graphics.OpenGL4.WaitSyncFlags flags);
internal static FenceSync glFenceSync;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void Finish();

21
Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
View file

@ -15292,6 +15292,21 @@ namespace OpenTK.Graphics.OpenGL4
{
}
/// <summary>
/// Used in GL.ClientWaitSync
/// </summary>
public enum ClientWaitSyncFlags : int
{
/// <summary>
/// Original was GL_NONE = 0
/// </summary>
None = ((int)0) ,
/// <summary>
/// Original was GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001
/// </summary>
SyncFlushCommandsBit = ((int)0x00000001) ,
}
/// <summary>
/// Not used directly.
/// </summary>
@ -33122,7 +33137,7 @@ namespace OpenTK.Graphics.OpenGL4
}
/// <summary>
/// Used in GL.ClientWaitSync, GL.WaitSync
/// Used in GL.FenceSync, GL.WaitSync
/// </summary>
public enum WaitSyncFlags : int
{
@ -33130,10 +33145,6 @@ namespace OpenTK.Graphics.OpenGL4
/// Original was GL_NONE = 0
/// </summary>
None = ((int)0) ,
/// <summary>
/// Original was GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001
/// </summary>
SyncFlushCommandsBit = ((int)0x00000001) ,
}
/// <summary>