From 8ed1e20a7a3b534d13c6f032126b4d3d08391f73 Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Thu, 5 Oct 2017 15:29:56 +0100 Subject: [PATCH] Generate legacy overloads for GetProgramResourceiv --- .../Specifications/GL2/overrides.xml | 12 +---- src/OpenTK/Graphics/OpenGL/GL.cs | 46 +++++++++---------- src/OpenTK/Graphics/OpenGL4/GL4.cs | 46 +++++++++---------- 3 files changed, 43 insertions(+), 61 deletions(-) diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml index 16c1c1eb..fe4dd4bc 100644 --- a/src/Generator.Bind/Specifications/GL2/overrides.xml +++ b/src/Generator.Bind/Specifications/GL2/overrides.xml @@ -1130,6 +1130,7 @@ ProgramProperty + @@ -1707,12 +1708,6 @@ int - - - - 0 - - @@ -1877,11 +1872,6 @@ ProgramParameter - - - 0 - - StringName diff --git a/src/OpenTK/Graphics/OpenGL/GL.cs b/src/OpenTK/Graphics/OpenGL/GL.cs index cb37c114..1a518991 100644 --- a/src/OpenTK/Graphics/OpenGL/GL.cs +++ b/src/OpenTK/Graphics/OpenGL/GL.cs @@ -48193,26 +48193,6 @@ namespace OpenTK.Graphics.OpenGL [CLSCompliant(false)] public static Int32 GetProgramResourceIndex(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, [CountAttribute(Computed = "name")] String name) { throw new BindingsNotRewrittenException(); } - /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] - /// Retrieve values for multiple properties of a single active resource within a program object - /// - /// - /// The name of a program object whose resources to query. - /// - /// - /// A token identifying the interface within program containing the resource named name. - /// - /// - /// - /// [length: propCount] - /// - /// [length: 1] - /// [length: bufSize] - [Obsolete("Use out overload instead")] - [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] - [CLSCompliant(false)] - public static void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL.ProgramProperty[] props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32[] @params) { throw new BindingsNotRewrittenException(); } - /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] /// Retrieve values for multiple properties of a single active resource within a program object /// @@ -48247,7 +48227,6 @@ namespace OpenTK.Graphics.OpenGL /// /// [length: 1] /// [length: bufSize] - [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] public static void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] ref OpenTK.Graphics.OpenGL.ProgramProperty props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufSize")] out Int32 @params) { throw new BindingsNotRewrittenException(); } @@ -48270,7 +48249,7 @@ namespace OpenTK.Graphics.OpenGL [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] - public static unsafe void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] /// Retrieve values for multiple properties of a single active resource within a program object @@ -48287,10 +48266,9 @@ namespace OpenTK.Graphics.OpenGL /// /// [length: 1] /// [length: bufSize] - [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] - public static void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL.ProgramProperty[] props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32[] @params) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] /// Retrieve values for multiple properties of a single active resource within a program object @@ -48326,7 +48304,6 @@ namespace OpenTK.Graphics.OpenGL /// /// [length: 1] /// [length: bufSize] - [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] public static void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] ref OpenTK.Graphics.OpenGL.ProgramProperty props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufSize")] out Int32 @params) { throw new BindingsNotRewrittenException(); } @@ -48349,6 +48326,25 @@ namespace OpenTK.Graphics.OpenGL [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] + public static unsafe void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } + + /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] + /// Retrieve values for multiple properties of a single active resource within a program object + /// + /// + /// The name of a program object whose resources to query. + /// + /// + /// A token identifying the interface within program containing the resource named name. + /// + /// + /// + /// [length: propCount] + /// + /// [length: 1] + /// [length: bufSize] + [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] + [CLSCompliant(false)] public static unsafe void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL.ProgramInterface programInterface, UInt32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] diff --git a/src/OpenTK/Graphics/OpenGL4/GL4.cs b/src/OpenTK/Graphics/OpenGL4/GL4.cs index e777729a..5692a616 100644 --- a/src/OpenTK/Graphics/OpenGL4/GL4.cs +++ b/src/OpenTK/Graphics/OpenGL4/GL4.cs @@ -26500,26 +26500,6 @@ namespace OpenTK.Graphics.OpenGL4 [CLSCompliant(false)] public static Int32 GetProgramResourceIndex(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, [CountAttribute(Computed = "name")] String name) { throw new BindingsNotRewrittenException(); } - /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] - /// Retrieve values for multiple properties of a single active resource within a program object - /// - /// - /// The name of a program object whose resources to query. - /// - /// - /// A token identifying the interface within program containing the resource named name. - /// - /// - /// - /// [length: propCount] - /// - /// [length: 1] - /// [length: bufSize] - [Obsolete("Use out overload instead")] - [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] - [CLSCompliant(false)] - public static void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL4.ProgramProperty[] props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32[] @params) { throw new BindingsNotRewrittenException(); } - /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] /// Retrieve values for multiple properties of a single active resource within a program object /// @@ -26554,7 +26534,6 @@ namespace OpenTK.Graphics.OpenGL4 /// /// [length: 1] /// [length: bufSize] - [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] public static void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] ref OpenTK.Graphics.OpenGL4.ProgramProperty props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufSize")] out Int32 @params) { throw new BindingsNotRewrittenException(); } @@ -26577,7 +26556,7 @@ namespace OpenTK.Graphics.OpenGL4 [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] - public static unsafe void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL4.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL4.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] /// Retrieve values for multiple properties of a single active resource within a program object @@ -26594,10 +26573,9 @@ namespace OpenTK.Graphics.OpenGL4 /// /// [length: 1] /// [length: bufSize] - [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] - public static void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, UInt32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL4.ProgramProperty[] props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32[] @params) { throw new BindingsNotRewrittenException(); } + public static unsafe void GetProgramResource(Int32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, Int32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL4.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] /// Retrieve values for multiple properties of a single active resource within a program object @@ -26633,7 +26611,6 @@ namespace OpenTK.Graphics.OpenGL4 /// /// [length: 1] /// [length: bufSize] - [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] public static void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, UInt32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] ref OpenTK.Graphics.OpenGL4.ProgramProperty props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufSize")] out Int32 @params) { throw new BindingsNotRewrittenException(); } @@ -26656,6 +26633,25 @@ namespace OpenTK.Graphics.OpenGL4 [Obsolete("Use out overload instead")] [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] [CLSCompliant(false)] + public static unsafe void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, UInt32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL4.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } + + /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3] + /// Retrieve values for multiple properties of a single active resource within a program object + /// + /// + /// The name of a program object whose resources to query. + /// + /// + /// A token identifying the interface within program containing the resource named name. + /// + /// + /// + /// [length: propCount] + /// + /// [length: 1] + /// [length: bufSize] + [AutoGenerated(Category = "ARB_program_interface_query|VERSION_4_3", Version = "4.3", EntryPoint = "glGetProgramResourceiv")] + [CLSCompliant(false)] public static unsafe void GetProgramResource(UInt32 program, OpenTK.Graphics.OpenGL4.ProgramInterface programInterface, UInt32 index, Int32 propCount, [CountAttribute(Parameter = "propCount")] OpenTK.Graphics.OpenGL4.ProgramProperty* props, Int32 bufSize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufSize")] Int32* @params) { throw new BindingsNotRewrittenException(); } /// [requires: v4.3 or ARB_program_interface_query|VERSION_4_3]