From 4cdaea4747e3825215630e2490a974d80e2552be Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Wed, 4 Oct 2017 11:35:26 +0100 Subject: [PATCH 1/6] Fix bug in Rewrite that didn't detect missing CountAttributes --- src/Generator.Rewrite/Program.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Generator.Rewrite/Program.cs b/src/Generator.Rewrite/Program.cs index f3a809b8..40040029 100644 --- a/src/Generator.Rewrite/Program.cs +++ b/src/Generator.Rewrite/Program.cs @@ -863,9 +863,10 @@ namespace OpenTK.Rewrite var attribute = parameter.CustomAttributes .FirstOrDefault(a => a.AttributeType.Name == "CountAttribute"); - var count = new CountAttribute(); + CountAttribute count = null; if (attribute != null) { + count = new CountAttribute(); count.Count = (int)(GetAttributeField(attribute, "Count") ?? 0); count.Parameter = (string)(GetAttributeField(attribute, "Parameter")); count.Computed = (string)(GetAttributeField(attribute, "Computed")); From 62d1072f7102ac1c626d7ebf8124125d7bebdee9 Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Wed, 4 Oct 2017 13:49:33 +0100 Subject: [PATCH 2/6] Override flow direction for glGetPerfQueryIdByNameINTEL The function in the OpenGL specification is not const correct. --- .../Specifications/GL2/overrides.xml | 9 +++++++++ src/OpenTK/Graphics/OpenGL/GL.cs | 16 ++++++++-------- src/OpenTK/Graphics/OpenGL4/GL4.cs | 16 ++++++++-------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml index fe4dd4bc..9aa80dc1 100644 --- a/src/Generator.Bind/Specifications/GL2/overrides.xml +++ b/src/Generator.Bind/Specifications/GL2/overrides.xml @@ -7440,4 +7440,13 @@ + + + + + + in + + + diff --git a/src/OpenTK/Graphics/OpenGL/GL.cs b/src/OpenTK/Graphics/OpenGL/GL.cs index 1a518991..9fb94f01 100644 --- a/src/OpenTK/Graphics/OpenGL/GL.cs +++ b/src/OpenTK/Graphics/OpenGL/GL.cs @@ -110605,49 +110605,49 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static Int32 GetPerfQueryIdByName([OutAttribute] out String queryName) { throw new BindingsNotRewrittenException(); } + public static Int32 GetPerfQueryIdByName(String queryName) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// @@ -147804,7 +147804,7 @@ namespace OpenTK.Graphics.OpenGL private static extern unsafe void glGetPerfQueryDataINTEL(UInt32 queryHandle, UInt32 flags, Int32 dataSize, [OutAttribute] IntPtr data, [OutAttribute] UInt32* bytesWritten); [Slot(958)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryIdByNameINTEL([OutAttribute] IntPtr queryName, [OutAttribute] UInt32* queryId); + private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId); [Slot(959)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); diff --git a/src/OpenTK/Graphics/OpenGL4/GL4.cs b/src/OpenTK/Graphics/OpenGL4/GL4.cs index 5692a616..c37bc7da 100644 --- a/src/OpenTK/Graphics/OpenGL4/GL4.cs +++ b/src/OpenTK/Graphics/OpenGL4/GL4.cs @@ -63815,49 +63815,49 @@ namespace OpenTK.Graphics.OpenGL4 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static Int32 GetPerfQueryIdByName([OutAttribute] out String queryName) { throw new BindingsNotRewrittenException(); } + public static Int32 GetPerfQueryIdByName(String queryName) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// @@ -80168,7 +80168,7 @@ namespace OpenTK.Graphics.OpenGL4 private static extern unsafe void glGetPerfQueryDataINTEL(UInt32 queryHandle, UInt32 flags, Int32 dataSize, [OutAttribute] IntPtr data, [OutAttribute] UInt32* bytesWritten); [Slot(493)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryIdByNameINTEL([OutAttribute] IntPtr queryName, [OutAttribute] UInt32* queryId); + private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId); [Slot(494)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); From 602045f08557a7e114770ac17f9157937030be17 Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Thu, 5 Oct 2017 15:46:15 +0100 Subject: [PATCH 3/6] Add count attributes to GetPerfCounterInfoINTEL out string/array parameters --- .../Specifications/GL2/overrides.xml | 10 +++ src/OpenTK/Graphics/ES20/ES20.cs | 80 +++++++++---------- src/OpenTK/Graphics/ES30/ES30.cs | 80 +++++++++---------- src/OpenTK/Graphics/ES31/ES31.cs | 80 +++++++++---------- src/OpenTK/Graphics/OpenGL/GL.cs | 38 ++++----- src/OpenTK/Graphics/OpenGL4/GL4.cs | 38 ++++----- 6 files changed, 168 insertions(+), 158 deletions(-) diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml index 9aa80dc1..d8221cbb 100644 --- a/src/Generator.Bind/Specifications/GL2/overrides.xml +++ b/src/Generator.Bind/Specifications/GL2/overrides.xml @@ -7448,5 +7448,15 @@ in + + + + + counterNameLength + + + counterDescLength + + diff --git a/src/OpenTK/Graphics/ES20/ES20.cs b/src/OpenTK/Graphics/ES20/ES20.cs index 815f14e4..5ea99a67 100644 --- a/src/OpenTK/Graphics/ES20/ES20.cs +++ b/src/OpenTK/Graphics/ES20/ES20.cs @@ -33041,9 +33041,9 @@ namespace OpenTK.Graphics.ES20 /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -33051,15 +33051,15 @@ namespace OpenTK.Graphics.ES20 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -33067,15 +33067,15 @@ namespace OpenTK.Graphics.ES20 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -33083,15 +33083,15 @@ namespace OpenTK.Graphics.ES20 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -33099,15 +33099,15 @@ namespace OpenTK.Graphics.ES20 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -33115,15 +33115,15 @@ namespace OpenTK.Graphics.ES20 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -33131,7 +33131,7 @@ namespace OpenTK.Graphics.ES20 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// @@ -33485,121 +33485,121 @@ namespace OpenTK.Graphics.ES20 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static Int32 GetPerfQueryIdByName([OutAttribute] out String queryName) { throw new BindingsNotRewrittenException(); } + public static Int32 GetPerfQueryIdByName(String queryName) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } } @@ -54626,16 +54626,16 @@ namespace OpenTK.Graphics.ES20 private static extern unsafe void glGetNextPerfQueryIdINTEL(UInt32 queryId, [OutAttribute] UInt32* nextQueryId); [Slot(262)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] IntPtr counterName, UInt32 counterDescLength, [OutAttribute] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); + private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] IntPtr counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); [Slot(269)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glGetPerfQueryDataINTEL(UInt32 queryHandle, UInt32 flags, Int32 dataSize, [OutAttribute] IntPtr data, [OutAttribute] UInt32* bytesWritten); [Slot(270)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryIdByNameINTEL([OutAttribute] IntPtr queryName, [OutAttribute] UInt32* queryId); + private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId); [Slot(271)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); + private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); [Slot(20)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern void glBlendBarrierKHR(); diff --git a/src/OpenTK/Graphics/ES30/ES30.cs b/src/OpenTK/Graphics/ES30/ES30.cs index 2c0c275f..a2ea1d3e 100644 --- a/src/OpenTK/Graphics/ES30/ES30.cs +++ b/src/OpenTK/Graphics/ES30/ES30.cs @@ -41438,9 +41438,9 @@ namespace OpenTK.Graphics.ES30 /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -41448,15 +41448,15 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -41464,15 +41464,15 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -41480,15 +41480,15 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -41496,15 +41496,15 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -41512,15 +41512,15 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -41528,7 +41528,7 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// @@ -41882,121 +41882,121 @@ namespace OpenTK.Graphics.ES30 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static Int32 GetPerfQueryIdByName([OutAttribute] out String queryName) { throw new BindingsNotRewrittenException(); } + public static Int32 GetPerfQueryIdByName(String queryName) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } } @@ -62951,16 +62951,16 @@ namespace OpenTK.Graphics.ES30 private static extern unsafe void glGetNextPerfQueryIdINTEL(UInt32 queryId, [OutAttribute] UInt32* nextQueryId); [Slot(307)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] IntPtr counterName, UInt32 counterDescLength, [OutAttribute] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); + private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] IntPtr counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); [Slot(314)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glGetPerfQueryDataINTEL(UInt32 queryHandle, UInt32 flags, Int32 dataSize, [OutAttribute] IntPtr data, [OutAttribute] UInt32* bytesWritten); [Slot(315)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryIdByNameINTEL([OutAttribute] IntPtr queryName, [OutAttribute] UInt32* queryId); + private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId); [Slot(316)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); + private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); [Slot(27)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern void glBlendBarrierKHR(); diff --git a/src/OpenTK/Graphics/ES31/ES31.cs b/src/OpenTK/Graphics/ES31/ES31.cs index 794ebdeb..42c4b5b1 100644 --- a/src/OpenTK/Graphics/ES31/ES31.cs +++ b/src/OpenTK/Graphics/ES31/ES31.cs @@ -40060,9 +40060,9 @@ namespace OpenTK.Graphics.ES31 /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -40070,15 +40070,15 @@ namespace OpenTK.Graphics.ES31 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -40086,15 +40086,15 @@ namespace OpenTK.Graphics.ES31 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -40102,15 +40102,15 @@ namespace OpenTK.Graphics.ES31 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -40118,15 +40118,15 @@ namespace OpenTK.Graphics.ES31 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -40134,15 +40134,15 @@ namespace OpenTK.Graphics.ES31 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -40150,7 +40150,7 @@ namespace OpenTK.Graphics.ES31 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// @@ -40504,121 +40504,121 @@ namespace OpenTK.Graphics.ES31 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static Int32 GetPerfQueryIdByName([OutAttribute] out String queryName) { throw new BindingsNotRewrittenException(); } + public static Int32 GetPerfQueryIdByName(String queryName) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out Int32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] Int32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32[] queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryIdByName(String queryName, [OutAttribute] out UInt32 queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryIdByNameINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryIdByName([OutAttribute] out String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryIdByName(String queryName, [OutAttribute] UInt32* queryId) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } } @@ -60140,16 +60140,16 @@ namespace OpenTK.Graphics.ES31 private static extern unsafe void glGetNextPerfQueryIdINTEL(UInt32 queryId, [OutAttribute] UInt32* nextQueryId); [Slot(322)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] IntPtr counterName, UInt32 counterDescLength, [OutAttribute] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); + private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] IntPtr counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); [Slot(329)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glGetPerfQueryDataINTEL(UInt32 queryHandle, UInt32 flags, Int32 dataSize, [OutAttribute] IntPtr data, [OutAttribute] UInt32* bytesWritten); [Slot(330)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryIdByNameINTEL([OutAttribute] IntPtr queryName, [OutAttribute] UInt32* queryId); + private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId); [Slot(331)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); + private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); [Slot(31)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern void glBlendBarrierKHR(); diff --git a/src/OpenTK/Graphics/OpenGL/GL.cs b/src/OpenTK/Graphics/OpenGL/GL.cs index 9fb94f01..daba3996 100644 --- a/src/OpenTK/Graphics/OpenGL/GL.cs +++ b/src/OpenTK/Graphics/OpenGL/GL.cs @@ -110161,9 +110161,9 @@ namespace OpenTK.Graphics.OpenGL /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -110171,15 +110171,15 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -110187,15 +110187,15 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -110203,15 +110203,15 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -110219,15 +110219,15 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -110235,15 +110235,15 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -110251,7 +110251,7 @@ namespace OpenTK.Graphics.OpenGL /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// @@ -147798,7 +147798,7 @@ namespace OpenTK.Graphics.OpenGL private static extern unsafe void glGetNextPerfQueryIdINTEL(UInt32 queryId, [OutAttribute] UInt32* nextQueryId); [Slot(950)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] IntPtr counterName, UInt32 counterDescLength, [OutAttribute] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); + private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] IntPtr counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); [Slot(957)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glGetPerfQueryDataINTEL(UInt32 queryHandle, UInt32 flags, Int32 dataSize, [OutAttribute] IntPtr data, [OutAttribute] UInt32* bytesWritten); diff --git a/src/OpenTK/Graphics/OpenGL4/GL4.cs b/src/OpenTK/Graphics/OpenGL4/GL4.cs index c37bc7da..d5a98554 100644 --- a/src/OpenTK/Graphics/OpenGL4/GL4.cs +++ b/src/OpenTK/Graphics/OpenGL4/GL4.cs @@ -63371,9 +63371,9 @@ namespace OpenTK.Graphics.OpenGL4 /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -63381,15 +63381,15 @@ namespace OpenTK.Graphics.OpenGL4 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32[] counterOffset, [OutAttribute] Int32[] counterDataSize, [OutAttribute] Int32[] counterTypeEnum, [OutAttribute] Int32[] counterDataTypeEnum, [OutAttribute] Int64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -63397,15 +63397,15 @@ namespace OpenTK.Graphics.OpenGL4 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out Int32 counterOffset, [OutAttribute] out Int32 counterDataSize, [OutAttribute] out Int32 counterTypeEnum, [OutAttribute] out Int32 counterDataTypeEnum, [OutAttribute] out Int64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -63413,15 +63413,15 @@ namespace OpenTK.Graphics.OpenGL4 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute] out String counterName, Int32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(Int32 queryId, Int32 counterId, Int32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, Int32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] Int32* counterOffset, [OutAttribute] Int32* counterDataSize, [OutAttribute] Int32* counterTypeEnum, [OutAttribute] Int32* counterDataTypeEnum, [OutAttribute] Int64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -63429,15 +63429,15 @@ namespace OpenTK.Graphics.OpenGL4 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32[] counterOffset, [OutAttribute] UInt32[] counterDataSize, [OutAttribute] UInt32[] counterTypeEnum, [OutAttribute] UInt32[] counterDataTypeEnum, [OutAttribute] UInt64[] rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -63445,15 +63445,15 @@ namespace OpenTK.Graphics.OpenGL4 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] out UInt32 counterOffset, [OutAttribute] out UInt32 counterDataSize, [OutAttribute] out UInt32 counterTypeEnum, [OutAttribute] out UInt32 counterDataTypeEnum, [OutAttribute] out UInt64 rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// /// - /// + /// [length: counterNameLength] /// - /// + /// [length: counterDescLength] /// /// /// @@ -63461,7 +63461,7 @@ namespace OpenTK.Graphics.OpenGL4 /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfCounterInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] out String counterName, UInt32 counterDescLength, [OutAttribute] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfCounterInfo(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] out String counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] out String counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// @@ -80162,7 +80162,7 @@ namespace OpenTK.Graphics.OpenGL4 private static extern unsafe void glGetNextPerfQueryIdINTEL(UInt32 queryId, [OutAttribute] UInt32* nextQueryId); [Slot(485)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute] IntPtr counterName, UInt32 counterDescLength, [OutAttribute] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); + private static extern unsafe void glGetPerfCounterInfoINTEL(UInt32 queryId, UInt32 counterId, UInt32 counterNameLength, [OutAttribute, CountAttribute(Parameter = "counterNameLength")] IntPtr counterName, UInt32 counterDescLength, [OutAttribute, CountAttribute(Parameter = "counterDescLength")] IntPtr counterDesc, [OutAttribute] UInt32* counterOffset, [OutAttribute] UInt32* counterDataSize, [OutAttribute] UInt32* counterTypeEnum, [OutAttribute] UInt32* counterDataTypeEnum, [OutAttribute] UInt64* rawCounterMaxValue); [Slot(492)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glGetPerfQueryDataINTEL(UInt32 queryHandle, UInt32 flags, Int32 dataSize, [OutAttribute] IntPtr data, [OutAttribute] UInt32* bytesWritten); From 0ff0fbf1f7008ef0e2c773fdcf73d312b4d1c065 Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Thu, 5 Oct 2017 16:07:04 +0100 Subject: [PATCH 4/6] Add count attribute to GetPerfQueryInfoINTEL out string parameter --- .../Specifications/GL2/overrides.xml | 7 +++++ src/OpenTK/Graphics/OpenGL/GL.cs | 26 +++++++++---------- src/OpenTK/Graphics/OpenGL4/GL4.cs | 26 +++++++++---------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml index d8221cbb..01d9e4e3 100644 --- a/src/Generator.Bind/Specifications/GL2/overrides.xml +++ b/src/Generator.Bind/Specifications/GL2/overrides.xml @@ -7458,5 +7458,12 @@ counterDescLength + + + + + queryNameLength + + diff --git a/src/OpenTK/Graphics/OpenGL/GL.cs b/src/OpenTK/Graphics/OpenGL/GL.cs index daba3996..80f88bef 100644 --- a/src/OpenTK/Graphics/OpenGL/GL.cs +++ b/src/OpenTK/Graphics/OpenGL/GL.cs @@ -110652,74 +110652,74 @@ namespace OpenTK.Graphics.OpenGL /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_map_texture] /// @@ -147807,7 +147807,7 @@ namespace OpenTK.Graphics.OpenGL private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId); [Slot(959)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); + private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); [Slot(1338)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe IntPtr glMapTexture2DINTEL(UInt32 texture, Int32 level, UInt32 access, [OutAttribute, CountAttribute(Count = 1)] Int32* stride, [OutAttribute, CountAttribute(Count = 1)] System.Int32* layout); diff --git a/src/OpenTK/Graphics/OpenGL4/GL4.cs b/src/OpenTK/Graphics/OpenGL4/GL4.cs index d5a98554..7cf95e0a 100644 --- a/src/OpenTK/Graphics/OpenGL4/GL4.cs +++ b/src/OpenTK/Graphics/OpenGL4/GL4.cs @@ -63862,74 +63862,74 @@ namespace OpenTK.Graphics.OpenGL4 /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } + public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); } /// [requires: INTEL_performance_query] /// /// - /// + /// [length: queryNameLength] /// /// /// /// [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")] [CLSCompliant(false)] - public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); } } @@ -80171,7 +80171,7 @@ namespace OpenTK.Graphics.OpenGL4 private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId); [Slot(494)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); + private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask); [Slot(37)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern void glBlendBarrierKHR(); From e55d7017e08bdcf9df07e5be0b0e1b5c13fafa1a Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Thu, 5 Oct 2017 16:26:22 +0100 Subject: [PATCH 5/6] Add count attribute to GetTranslatedShaderSource out string parameter --- .../Specifications/GL2/overrides.xml | 4 +++ src/OpenTK/Graphics/ES20/ES20.cs | 26 +++++++++---------- src/OpenTK/Graphics/ES30/ES30.cs | 26 +++++++++---------- src/OpenTK/Graphics/ES31/ES31.cs | 26 +++++++++---------- 4 files changed, 43 insertions(+), 39 deletions(-) diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml index 01d9e4e3..e3fefd9c 100644 --- a/src/Generator.Bind/Specifications/GL2/overrides.xml +++ b/src/Generator.Bind/Specifications/GL2/overrides.xml @@ -5536,8 +5536,12 @@ + + + bufsize + diff --git a/src/OpenTK/Graphics/ES20/ES20.cs b/src/OpenTK/Graphics/ES20/ES20.cs index 5ea99a67..2cbceeeb 100644 --- a/src/OpenTK/Graphics/ES20/ES20.cs +++ b/src/OpenTK/Graphics/ES20/ES20.cs @@ -2219,57 +2219,57 @@ namespace OpenTK.Graphics.ES20 /// /// /// [length: 1] - /// + /// [length: bufsize] [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_framebuffer_multisample] /// Establish data storage, format, dimensions and sample count of a renderbuffer object's image @@ -53546,7 +53546,7 @@ namespace OpenTK.Graphics.ES20 private static extern void glDrawElementsInstancedANGLE(System.Int32 mode, Int32 count, System.Int32 type, [CountAttribute(Computed = "count,type")] IntPtr indices, Int32 primcount); [Slot(308)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] IntPtr source); + private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] IntPtr source); [Slot(482)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern void glRenderbufferStorageMultisampleANGLE(System.Int32 target, Int32 samples, System.Int32 internalformat, Int32 width, Int32 height); diff --git a/src/OpenTK/Graphics/ES30/ES30.cs b/src/OpenTK/Graphics/ES30/ES30.cs index a2ea1d3e..f28d51bd 100644 --- a/src/OpenTK/Graphics/ES30/ES30.cs +++ b/src/OpenTK/Graphics/ES30/ES30.cs @@ -2427,57 +2427,57 @@ namespace OpenTK.Graphics.ES30 /// /// /// [length: 1] - /// + /// [length: bufsize] [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_framebuffer_multisample] /// Establish data storage, format, dimensions and sample count of a renderbuffer object's image @@ -61559,7 +61559,7 @@ namespace OpenTK.Graphics.ES30 private static extern void glDrawElementsInstancedANGLE(System.Int32 mode, Int32 count, System.Int32 type, [CountAttribute(Computed = "count,type")] IntPtr indices, Int32 primcount); [Slot(361)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] IntPtr source); + private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] IntPtr source); [Slot(553)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern void glRenderbufferStorageMultisampleANGLE(System.Int32 target, Int32 samples, System.Int32 internalformat, Int32 width, Int32 height); diff --git a/src/OpenTK/Graphics/ES31/ES31.cs b/src/OpenTK/Graphics/ES31/ES31.cs index 42c4b5b1..ec69e03a 100644 --- a/src/OpenTK/Graphics/ES31/ES31.cs +++ b/src/OpenTK/Graphics/ES31/ES31.cs @@ -2557,57 +2557,57 @@ namespace OpenTK.Graphics.ES31 /// /// /// [length: 1] - /// + /// [length: bufsize] [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_translated_shader_source] /// /// /// [length: 1] - /// + /// [length: bufsize] [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")] [CLSCompliant(false)] - public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); } /// [requires: ANGLE_framebuffer_multisample] /// Establish data storage, format, dimensions and sample count of a renderbuffer object's image @@ -58544,7 +58544,7 @@ namespace OpenTK.Graphics.ES31 private static extern void glDrawElementsInstancedANGLE(System.Int32 mode, Int32 count, System.Int32 type, [CountAttribute(Computed = "count,type")] IntPtr indices, Int32 primcount); [Slot(385)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] IntPtr source); + private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] IntPtr source); [Slot(613)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern void glRenderbufferStorageMultisampleANGLE(System.Int32 target, Int32 samples, System.Int32 internalformat, Int32 width, Int32 height); From ea09f567407e6a32ce01df65a61ecc91f355d7cf Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Thu, 5 Oct 2017 18:28:36 +0100 Subject: [PATCH 6/6] Add missing count attribute to ExtGetProgramBinarySourceQCOM Also extends Rewrite to understand the new syntax of "*name". --- .../Specifications/GL2/overrides.xml | 12 ++++++++- src/Generator.Rewrite/Program.cs | 12 +++++++-- src/OpenTK/Graphics/ES11/ES11.cs | 26 +++++++++---------- src/OpenTK/Graphics/ES20/ES20.cs | 26 +++++++++---------- src/OpenTK/Graphics/ES30/ES30.cs | 26 +++++++++---------- src/OpenTK/Graphics/ES31/ES31.cs | 26 +++++++++---------- 6 files changed, 73 insertions(+), 55 deletions(-) diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml index e3fefd9c..b57df4a7 100644 --- a/src/Generator.Bind/Specifications/GL2/overrides.xml +++ b/src/Generator.Bind/Specifications/GL2/overrides.xml @@ -7470,4 +7470,14 @@ - + + + + + + + *length + + + + \ No newline at end of file diff --git a/src/Generator.Rewrite/Program.cs b/src/Generator.Rewrite/Program.cs index 40040029..c6620889 100644 --- a/src/Generator.Rewrite/Program.cs +++ b/src/Generator.Rewrite/Program.cs @@ -880,8 +880,8 @@ namespace OpenTK.Rewrite var countVariable = new VariableDefinition(TypeInt32); body.Variables.Add(countVariable); - // Parameter will either by a simple name or an - // expression like "name*5" + // Parameter will either by a simple name, a dereference of a name + // like "*name" or an expression like "name*5" var parameter = method.Parameters.FirstOrDefault( param => param.Name == countParameter); if (parameter != null) @@ -889,6 +889,14 @@ namespace OpenTK.Rewrite il.Emit(OpCodes.Ldarg, parameter.Index); il.Emit(OpCodes.Stloc, countVariable.Index); } + else if (countParameter[0] == '*') + { + var pointerParam = method.Parameters.FirstOrDefault( + param => param.Name == countParameter.Substring(1)); + + il.Emit(OpCodes.Ldarg, pointerParam.Index); + il.Emit(OpCodes.Ldind_I4); + } else { var operands = countParameter.Split('*'); diff --git a/src/OpenTK/Graphics/ES11/ES11.cs b/src/OpenTK/Graphics/ES11/ES11.cs index 36c8e8f4..53dc2a56 100644 --- a/src/OpenTK/Graphics/ES11/ES11.cs +++ b/src/OpenTK/Graphics/ES11/ES11.cs @@ -14542,56 +14542,56 @@ namespace OpenTK.Graphics.ES11 /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static unsafe void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } + public static unsafe void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static unsafe void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } + public static unsafe void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES11.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// [length: maxPrograms] @@ -16240,7 +16240,7 @@ namespace OpenTK.Graphics.ES11 private static extern unsafe void glExtGetFramebuffersQCOM([OutAttribute, CountAttribute(Parameter = "maxFramebuffers")] UInt32* framebuffers, Int32 maxFramebuffers, [OutAttribute, CountAttribute(Count = 1)] Int32* numFramebuffers); [Slot(96)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glExtGetProgramBinarySourceQCOM(UInt32 program, System.Int32 shadertype, [OutAttribute] IntPtr source, [OutAttribute] Int32* length); + private static extern unsafe void glExtGetProgramBinarySourceQCOM(UInt32 program, System.Int32 shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] IntPtr source, [OutAttribute] Int32* length); [Slot(97)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glExtGetProgramsQCOM([OutAttribute, CountAttribute(Parameter = "maxPrograms")] UInt32* programs, Int32 maxPrograms, [OutAttribute, CountAttribute(Count = 1)] Int32* numPrograms); diff --git a/src/OpenTK/Graphics/ES20/ES20.cs b/src/OpenTK/Graphics/ES20/ES20.cs index 2cbceeeb..84a94388 100644 --- a/src/OpenTK/Graphics/ES20/ES20.cs +++ b/src/OpenTK/Graphics/ES20/ES20.cs @@ -52846,56 +52846,56 @@ namespace OpenTK.Graphics.ES20 /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static unsafe void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } + public static unsafe void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static unsafe void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } + public static unsafe void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES20.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// [length: maxPrograms] @@ -55376,7 +55376,7 @@ namespace OpenTK.Graphics.ES20 private static extern unsafe void glExtGetFramebuffersQCOM([OutAttribute, CountAttribute(Parameter = "maxFramebuffers")] UInt32* framebuffers, Int32 maxFramebuffers, [OutAttribute, CountAttribute(Count = 1)] Int32* numFramebuffers); [Slot(161)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glExtGetProgramBinarySourceQCOM(UInt32 program, System.Int32 shadertype, [OutAttribute] IntPtr source, [OutAttribute] Int32* length); + private static extern unsafe void glExtGetProgramBinarySourceQCOM(UInt32 program, System.Int32 shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] IntPtr source, [OutAttribute] Int32* length); [Slot(162)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glExtGetProgramsQCOM([OutAttribute, CountAttribute(Parameter = "maxPrograms")] UInt32* programs, Int32 maxPrograms, [OutAttribute, CountAttribute(Count = 1)] Int32* numPrograms); diff --git a/src/OpenTK/Graphics/ES30/ES30.cs b/src/OpenTK/Graphics/ES30/ES30.cs index f28d51bd..74f05458 100644 --- a/src/OpenTK/Graphics/ES30/ES30.cs +++ b/src/OpenTK/Graphics/ES30/ES30.cs @@ -60859,56 +60859,56 @@ namespace OpenTK.Graphics.ES30 /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static unsafe void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } + public static unsafe void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static unsafe void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } + public static unsafe void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES30.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// [length: maxPrograms] @@ -63701,7 +63701,7 @@ namespace OpenTK.Graphics.ES30 private static extern unsafe void glExtGetFramebuffersQCOM([OutAttribute, CountAttribute(Parameter = "maxFramebuffers")] UInt32* framebuffers, Int32 maxFramebuffers, [OutAttribute, CountAttribute(Count = 1)] Int32* numFramebuffers); [Slot(189)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glExtGetProgramBinarySourceQCOM(UInt32 program, System.Int32 shadertype, [OutAttribute] IntPtr source, [OutAttribute] Int32* length); + private static extern unsafe void glExtGetProgramBinarySourceQCOM(UInt32 program, System.Int32 shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] IntPtr source, [OutAttribute] Int32* length); [Slot(190)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glExtGetProgramsQCOM([OutAttribute, CountAttribute(Parameter = "maxPrograms")] UInt32* programs, Int32 maxPrograms, [OutAttribute, CountAttribute(Count = 1)] Int32* numPrograms); diff --git a/src/OpenTK/Graphics/ES31/ES31.cs b/src/OpenTK/Graphics/ES31/ES31.cs index ec69e03a..c0eb400e 100644 --- a/src/OpenTK/Graphics/ES31/ES31.cs +++ b/src/OpenTK/Graphics/ES31/ES31.cs @@ -57844,56 +57844,56 @@ namespace OpenTK.Graphics.ES31 /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static unsafe void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } + public static unsafe void ExtGetProgramBinarySource(Int32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32[] length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } + public static void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] out Int32 length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// /// - /// + /// [length: *length] /// [AutoGenerated(Category = "QCOM_extended_get2", Version = "", EntryPoint = "glExtGetProgramBinarySourceQCOM")] [CLSCompliant(false)] - public static unsafe void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } + public static unsafe void ExtGetProgramBinarySource(UInt32 program, OpenTK.Graphics.ES31.All shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] out String source, [OutAttribute] Int32* length) { throw new BindingsNotRewrittenException(); } /// [requires: QCOM_extended_get2] /// [length: maxPrograms] @@ -60890,7 +60890,7 @@ namespace OpenTK.Graphics.ES31 private static extern unsafe void glExtGetFramebuffersQCOM([OutAttribute, CountAttribute(Parameter = "maxFramebuffers")] UInt32* framebuffers, Int32 maxFramebuffers, [OutAttribute, CountAttribute(Count = 1)] Int32* numFramebuffers); [Slot(199)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern unsafe void glExtGetProgramBinarySourceQCOM(UInt32 program, System.Int32 shadertype, [OutAttribute] IntPtr source, [OutAttribute] Int32* length); + private static extern unsafe void glExtGetProgramBinarySourceQCOM(UInt32 program, System.Int32 shadertype, [OutAttribute, CountAttribute(Parameter = "*length")] IntPtr source, [OutAttribute] Int32* length); [Slot(200)] [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern unsafe void glExtGetProgramsQCOM([OutAttribute, CountAttribute(Parameter = "maxPrograms")] UInt32* programs, Int32 maxPrograms, [OutAttribute, CountAttribute(Count = 1)] Int32* numPrograms);