From de38df88202ea96e24a3a6a2e5e652c29001b4cf Mon Sep 17 00:00:00 2001 From: Stefanos A Date: Thu, 7 Nov 2013 08:36:23 +0100 Subject: [PATCH] Fixed strong-enums for GetDebugMessageLog GetDebugMessageLog is part of KHR_debug. --- Source/Bind/Specifications/GL2/overrides.xml | 5 + Source/OpenTK/Graphics/ES30/ES30.cs | 96 ++++++++++---------- Source/OpenTK/Graphics/ES30/ES30Delegates.cs | 4 +- Source/OpenTK/Graphics/ES30/ES30Enums.cs | 8 +- Source/OpenTK/Graphics/ES30/ES3Core.cs | 4 +- 5 files changed, 61 insertions(+), 56 deletions(-) diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml index d5f8ee43..669cc057 100644 --- a/Source/Bind/Specifications/GL2/overrides.xml +++ b/Source/Bind/Specifications/GL2/overrides.xml @@ -5435,6 +5435,11 @@ DebugType DebugSeverity + + DebugSourceExternal + DebugType + DebugSeverity + diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs index 1dfb39cc..2b6a22bf 100644 --- a/Source/OpenTK/Graphics/ES30/ES30.cs +++ b/Source/OpenTK/Graphics/ES30/ES30.cs @@ -13880,7 +13880,7 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")] public static - Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All[] sources, [OutAttribute] OpenTK.Graphics.ES30.All[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.ES30.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog) + Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal[] sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -13888,13 +13888,13 @@ namespace OpenTK.Graphics.ES30 #endif unsafe { - fixed (OpenTK.Graphics.ES30.All* sources_ptr = sources) - fixed (OpenTK.Graphics.ES30.All* types_ptr = types) + fixed (OpenTK.Graphics.ES30.DebugSourceExternal* sources_ptr = sources) + fixed (OpenTK.Graphics.ES30.DebugType* types_ptr = types) fixed (Int32* ids_ptr = ids) - fixed (OpenTK.Graphics.ES30.All* severities_ptr = severities) + fixed (OpenTK.Graphics.ES30.DebugSeverity* severities_ptr = severities) fixed (Int32* lengths_ptr = lengths) { - return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources_ptr, (OpenTK.Graphics.ES30.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); + return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES30.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); } } #if DEBUG @@ -13948,7 +13948,7 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")] public static - Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES30.All sources, [OutAttribute] out OpenTK.Graphics.ES30.All types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.ES30.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog) + Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES30.DebugSourceExternal sources, [OutAttribute] out OpenTK.Graphics.ES30.DebugType types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.ES30.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -13956,13 +13956,13 @@ namespace OpenTK.Graphics.ES30 #endif unsafe { - fixed (OpenTK.Graphics.ES30.All* sources_ptr = &sources) - fixed (OpenTK.Graphics.ES30.All* types_ptr = &types) + fixed (OpenTK.Graphics.ES30.DebugSourceExternal* sources_ptr = &sources) + fixed (OpenTK.Graphics.ES30.DebugType* types_ptr = &types) fixed (Int32* ids_ptr = &ids) - fixed (OpenTK.Graphics.ES30.All* severities_ptr = &severities) + fixed (OpenTK.Graphics.ES30.DebugSeverity* severities_ptr = &severities) fixed (Int32* lengths_ptr = &lengths) { - Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources_ptr, (OpenTK.Graphics.ES30.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); + Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES30.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); sources = *sources_ptr; types = *types_ptr; ids = *ids_ptr; @@ -14023,13 +14023,13 @@ namespace OpenTK.Graphics.ES30 [System.CLSCompliant(false)] [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")] public static - unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All* sources, [OutAttribute] OpenTK.Graphics.ES30.All* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.ES30.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog) + unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources, (OpenTK.Graphics.ES30.All*)types, (UInt32*)ids, (OpenTK.Graphics.ES30.All*)severities, (Int32*)lengths, (StringBuilder)messageLog); + return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources, (OpenTK.Graphics.ES30.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.ES30.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog); #if DEBUG } #endif @@ -14082,7 +14082,7 @@ namespace OpenTK.Graphics.ES30 [System.CLSCompliant(false)] [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")] public static - Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All[] sources, [OutAttribute] OpenTK.Graphics.ES30.All[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.ES30.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog) + Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal[] sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -14090,13 +14090,13 @@ namespace OpenTK.Graphics.ES30 #endif unsafe { - fixed (OpenTK.Graphics.ES30.All* sources_ptr = sources) - fixed (OpenTK.Graphics.ES30.All* types_ptr = types) + fixed (OpenTK.Graphics.ES30.DebugSourceExternal* sources_ptr = sources) + fixed (OpenTK.Graphics.ES30.DebugType* types_ptr = types) fixed (UInt32* ids_ptr = ids) - fixed (OpenTK.Graphics.ES30.All* severities_ptr = severities) + fixed (OpenTK.Graphics.ES30.DebugSeverity* severities_ptr = severities) fixed (Int32* lengths_ptr = lengths) { - return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources_ptr, (OpenTK.Graphics.ES30.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); + return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES30.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); } } #if DEBUG @@ -14151,7 +14151,7 @@ namespace OpenTK.Graphics.ES30 [System.CLSCompliant(false)] [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")] public static - Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES30.All sources, [OutAttribute] out OpenTK.Graphics.ES30.All types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.ES30.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog) + Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES30.DebugSourceExternal sources, [OutAttribute] out OpenTK.Graphics.ES30.DebugType types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.ES30.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -14159,13 +14159,13 @@ namespace OpenTK.Graphics.ES30 #endif unsafe { - fixed (OpenTK.Graphics.ES30.All* sources_ptr = &sources) - fixed (OpenTK.Graphics.ES30.All* types_ptr = &types) + fixed (OpenTK.Graphics.ES30.DebugSourceExternal* sources_ptr = &sources) + fixed (OpenTK.Graphics.ES30.DebugType* types_ptr = &types) fixed (UInt32* ids_ptr = &ids) - fixed (OpenTK.Graphics.ES30.All* severities_ptr = &severities) + fixed (OpenTK.Graphics.ES30.DebugSeverity* severities_ptr = &severities) fixed (Int32* lengths_ptr = &lengths) { - Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources_ptr, (OpenTK.Graphics.ES30.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); + Int32 retval = Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES30.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); sources = *sources_ptr; types = *types_ptr; ids = *ids_ptr; @@ -14226,13 +14226,13 @@ namespace OpenTK.Graphics.ES30 [System.CLSCompliant(false)] [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLog")] public static - unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All* sources, [OutAttribute] OpenTK.Graphics.ES30.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog) + unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources, (OpenTK.Graphics.ES30.All*)types, (UInt32*)ids, (OpenTK.Graphics.ES30.All*)severities, (Int32*)lengths, (StringBuilder)messageLog); + return Delegates.glGetDebugMessageLog((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources, (OpenTK.Graphics.ES30.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.ES30.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog); #if DEBUG } #endif @@ -46066,7 +46066,7 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")] public static - Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All[] sources, [OutAttribute] OpenTK.Graphics.ES30.All[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.ES30.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog) + Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal[] sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType[] types, [OutAttribute] Int32[] ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46074,13 +46074,13 @@ namespace OpenTK.Graphics.ES30 #endif unsafe { - fixed (OpenTK.Graphics.ES30.All* sources_ptr = sources) - fixed (OpenTK.Graphics.ES30.All* types_ptr = types) + fixed (OpenTK.Graphics.ES30.DebugSourceExternal* sources_ptr = sources) + fixed (OpenTK.Graphics.ES30.DebugType* types_ptr = types) fixed (Int32* ids_ptr = ids) - fixed (OpenTK.Graphics.ES30.All* severities_ptr = severities) + fixed (OpenTK.Graphics.ES30.DebugSeverity* severities_ptr = severities) fixed (Int32* lengths_ptr = lengths) { - return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources_ptr, (OpenTK.Graphics.ES30.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); + return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES30.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); } } #if DEBUG @@ -46134,7 +46134,7 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")] public static - Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES30.All sources, [OutAttribute] out OpenTK.Graphics.ES30.All types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.ES30.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog) + Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES30.DebugSourceExternal sources, [OutAttribute] out OpenTK.Graphics.ES30.DebugType types, [OutAttribute] out Int32 ids, [OutAttribute] out OpenTK.Graphics.ES30.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46142,13 +46142,13 @@ namespace OpenTK.Graphics.ES30 #endif unsafe { - fixed (OpenTK.Graphics.ES30.All* sources_ptr = &sources) - fixed (OpenTK.Graphics.ES30.All* types_ptr = &types) + fixed (OpenTK.Graphics.ES30.DebugSourceExternal* sources_ptr = &sources) + fixed (OpenTK.Graphics.ES30.DebugType* types_ptr = &types) fixed (Int32* ids_ptr = &ids) - fixed (OpenTK.Graphics.ES30.All* severities_ptr = &severities) + fixed (OpenTK.Graphics.ES30.DebugSeverity* severities_ptr = &severities) fixed (Int32* lengths_ptr = &lengths) { - Int32 retval = Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources_ptr, (OpenTK.Graphics.ES30.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); + Int32 retval = Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES30.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); sources = *sources_ptr; types = *types_ptr; ids = *ids_ptr; @@ -46209,13 +46209,13 @@ namespace OpenTK.Graphics.ES30 [System.CLSCompliant(false)] [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")] public static - unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All* sources, [OutAttribute] OpenTK.Graphics.ES30.All* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.ES30.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog) + unsafe Int32 GetDebugMessageLog(Int32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType* types, [OutAttribute] Int32* ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources, (OpenTK.Graphics.ES30.All*)types, (UInt32*)ids, (OpenTK.Graphics.ES30.All*)severities, (Int32*)lengths, (StringBuilder)messageLog); + return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources, (OpenTK.Graphics.ES30.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.ES30.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog); #if DEBUG } #endif @@ -46268,7 +46268,7 @@ namespace OpenTK.Graphics.ES30 [System.CLSCompliant(false)] [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")] public static - Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All[] sources, [OutAttribute] OpenTK.Graphics.ES30.All[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.ES30.All[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog) + Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal[] sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType[] types, [OutAttribute] UInt32[] ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity[] severities, [OutAttribute] Int32[] lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46276,13 +46276,13 @@ namespace OpenTK.Graphics.ES30 #endif unsafe { - fixed (OpenTK.Graphics.ES30.All* sources_ptr = sources) - fixed (OpenTK.Graphics.ES30.All* types_ptr = types) + fixed (OpenTK.Graphics.ES30.DebugSourceExternal* sources_ptr = sources) + fixed (OpenTK.Graphics.ES30.DebugType* types_ptr = types) fixed (UInt32* ids_ptr = ids) - fixed (OpenTK.Graphics.ES30.All* severities_ptr = severities) + fixed (OpenTK.Graphics.ES30.DebugSeverity* severities_ptr = severities) fixed (Int32* lengths_ptr = lengths) { - return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources_ptr, (OpenTK.Graphics.ES30.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); + return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES30.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); } } #if DEBUG @@ -46337,7 +46337,7 @@ namespace OpenTK.Graphics.ES30 [System.CLSCompliant(false)] [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")] public static - Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES30.All sources, [OutAttribute] out OpenTK.Graphics.ES30.All types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.ES30.All severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog) + Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] out OpenTK.Graphics.ES30.DebugSourceExternal sources, [OutAttribute] out OpenTK.Graphics.ES30.DebugType types, [OutAttribute] out UInt32 ids, [OutAttribute] out OpenTK.Graphics.ES30.DebugSeverity severities, [OutAttribute] out Int32 lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -46345,13 +46345,13 @@ namespace OpenTK.Graphics.ES30 #endif unsafe { - fixed (OpenTK.Graphics.ES30.All* sources_ptr = &sources) - fixed (OpenTK.Graphics.ES30.All* types_ptr = &types) + fixed (OpenTK.Graphics.ES30.DebugSourceExternal* sources_ptr = &sources) + fixed (OpenTK.Graphics.ES30.DebugType* types_ptr = &types) fixed (UInt32* ids_ptr = &ids) - fixed (OpenTK.Graphics.ES30.All* severities_ptr = &severities) + fixed (OpenTK.Graphics.ES30.DebugSeverity* severities_ptr = &severities) fixed (Int32* lengths_ptr = &lengths) { - Int32 retval = Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources_ptr, (OpenTK.Graphics.ES30.All*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.All*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); + Int32 retval = Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources_ptr, (OpenTK.Graphics.ES30.DebugType*)types_ptr, (UInt32*)ids_ptr, (OpenTK.Graphics.ES30.DebugSeverity*)severities_ptr, (Int32*)lengths_ptr, (StringBuilder)messageLog); sources = *sources_ptr; types = *types_ptr; ids = *ids_ptr; @@ -46412,13 +46412,13 @@ namespace OpenTK.Graphics.ES30 [System.CLSCompliant(false)] [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glGetDebugMessageLogKHR")] public static - unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All* sources, [OutAttribute] OpenTK.Graphics.ES30.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog) + unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) { #endif - return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.All*)sources, (OpenTK.Graphics.ES30.All*)types, (UInt32*)ids, (OpenTK.Graphics.ES30.All*)severities, (Int32*)lengths, (StringBuilder)messageLog); + return Delegates.glGetDebugMessageLogKHR((UInt32)count, (Int32)bufSize, (OpenTK.Graphics.ES30.DebugSourceExternal*)sources, (OpenTK.Graphics.ES30.DebugType*)types, (UInt32*)ids, (OpenTK.Graphics.ES30.DebugSeverity*)severities, (Int32*)lengths, (StringBuilder)messageLog); #if DEBUG } #endif diff --git a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs index 24dba021..a1c1d8e2 100644 --- a/Source/OpenTK/Graphics/ES30/ES30Delegates.cs +++ b/Source/OpenTK/Graphics/ES30/ES30Delegates.cs @@ -564,10 +564,10 @@ namespace OpenTK.Graphics.ES30 internal delegate void GetBufferPointervOES(OpenTK.Graphics.ES30.BufferTarget target, OpenTK.Graphics.ES30.BufferPointer pname, [OutAttribute] IntPtr @params); internal static GetBufferPointervOES glGetBufferPointervOES; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All* sources, [OutAttribute] OpenTK.Graphics.ES30.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog); + internal unsafe delegate Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog); internal unsafe static GetDebugMessageLog glGetDebugMessageLog; [System.Security.SuppressUnmanagedCodeSecurity()] - internal unsafe delegate Int32 GetDebugMessageLogKHR(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All* sources, [OutAttribute] OpenTK.Graphics.ES30.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog); + internal unsafe delegate Int32 GetDebugMessageLogKHR(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog); internal unsafe static GetDebugMessageLogKHR glGetDebugMessageLogKHR; [System.Security.SuppressUnmanagedCodeSecurity()] internal unsafe delegate void GetDriverControlsQCOM([OutAttribute] Int32* num, Int32 size, [OutAttribute] UInt32* driverControls); diff --git a/Source/OpenTK/Graphics/ES30/ES30Enums.cs b/Source/OpenTK/Graphics/ES30/ES30Enums.cs index 136612d1..d6813253 100644 --- a/Source/OpenTK/Graphics/ES30/ES30Enums.cs +++ b/Source/OpenTK/Graphics/ES30/ES30Enums.cs @@ -385,7 +385,7 @@ namespace OpenTK.Graphics.ES30 } /// - /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 55 other functions + /// Used in GL.Amd.GetPerfMonitorCounterData, GL.Amd.GetPerfMonitorCounterInfo and 53 other functions /// public enum All : int { @@ -10180,7 +10180,7 @@ namespace OpenTK.Graphics.ES30 } /// - /// Used in GL.DebugMessageInsert, GL.Khr.DebugMessageInsert + /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog and 2 other functions /// public enum DebugSeverity : int { @@ -10296,7 +10296,7 @@ namespace OpenTK.Graphics.ES30 } /// - /// Used in GL.DebugMessageInsert, GL.Khr.DebugMessageInsert + /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog and 2 other functions /// public enum DebugSourceExternal : int { @@ -10311,7 +10311,7 @@ namespace OpenTK.Graphics.ES30 } /// - /// Used in GL.DebugMessageInsert, GL.Khr.DebugMessageInsert + /// Used in GL.DebugMessageInsert, GL.GetDebugMessageLog and 2 other functions /// public enum DebugType : int { diff --git a/Source/OpenTK/Graphics/ES30/ES3Core.cs b/Source/OpenTK/Graphics/ES30/ES3Core.cs index f4433ae1..569cf10c 100644 --- a/Source/OpenTK/Graphics/ES30/ES3Core.cs +++ b/Source/OpenTK/Graphics/ES30/ES3Core.cs @@ -566,10 +566,10 @@ namespace OpenTK.Graphics.ES30 internal extern static void GetBufferPointervOES(OpenTK.Graphics.ES30.BufferTarget target, OpenTK.Graphics.ES30.BufferPointer pname, [OutAttribute] IntPtr @params); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLog", ExactSpelling = true)] - internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All* sources, [OutAttribute] OpenTK.Graphics.ES30.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog); + internal extern static unsafe Int32 GetDebugMessageLog(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDebugMessageLogKHR", ExactSpelling = true)] - internal extern static unsafe Int32 GetDebugMessageLogKHR(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.All* sources, [OutAttribute] OpenTK.Graphics.ES30.All* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.All* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog); + internal extern static unsafe Int32 GetDebugMessageLogKHR(UInt32 count, Int32 bufSize, [OutAttribute] OpenTK.Graphics.ES30.DebugSourceExternal* sources, [OutAttribute] OpenTK.Graphics.ES30.DebugType* types, [OutAttribute] UInt32* ids, [OutAttribute] OpenTK.Graphics.ES30.DebugSeverity* severities, [OutAttribute] Int32* lengths, [OutAttribute] StringBuilder messageLog); [System.Security.SuppressUnmanagedCodeSecurity()] [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetDriverControlsQCOM", ExactSpelling = true)] internal extern static unsafe void GetDriverControlsQCOM([OutAttribute] Int32* num, Int32 size, [OutAttribute] UInt32* driverControls);