From 02120f429f9b7060dfd856a94e02f8dfbc3f8715 Mon Sep 17 00:00:00 2001 From: Stefanos A Date: Wed, 20 Nov 2013 08:14:58 +0100 Subject: [PATCH] Do not trim 's' from Groups --- Source/Bind/FuncProcessor.cs | 2 +- Source/OpenTK/Graphics/ES20/ES20.cs | 12 ++++++------ Source/OpenTK/Graphics/ES30/ES30.cs | 12 ++++++------ Source/OpenTK/Graphics/OpenGL/GL.cs | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Source/Bind/FuncProcessor.cs b/Source/Bind/FuncProcessor.cs index a6cbcbf795..9526fc0a48 100644 --- a/Source/Bind/FuncProcessor.cs +++ b/Source/Bind/FuncProcessor.cs @@ -49,7 +49,7 @@ class FuncProcessor static readonly Regex EndingsNotToTrim = new Regex( "(sh|ib|[tdrey]s|[eE]n[vd]|bled" + "|Attrib|Access|Boolean|Coord|Depth|Feedbacks|Finish|Flag" + - "|IDs|Indexed|Instanced|Pixels|Queries|Status|Tess|Through" + + "|Groups|IDs|Indexed|Instanced|Pixels|Queries|Status|Tess|Through" + "|Uniforms|Varyings|Weight|Width)$", RegexOptions.Compiled); static readonly Regex EndingsAddV = new Regex("^0", RegexOptions.Compiled); diff --git a/Source/OpenTK/Graphics/ES20/ES20.cs b/Source/OpenTK/Graphics/ES20/ES20.cs index 8f02d83b9d..5812b3edee 100644 --- a/Source/OpenTK/Graphics/ES20/ES20.cs +++ b/Source/OpenTK/Graphics/ES20/ES20.cs @@ -976,7 +976,7 @@ unsafe void GetPerfMonitorCounterString(UInt32 group, UInt32 counter, Int32 bufS /// [requires: AMD_performance_monitor] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -999,7 +999,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ /// [requires: AMD_performance_monitor] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out Int32 groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out Int32 groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -1024,7 +1024,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -1048,7 +1048,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out UInt32 groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out UInt32 groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -1073,7 +1073,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups) + unsafe void GetPerfMonitorGroups([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -1089,7 +1089,7 @@ unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSiz [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups) + unsafe void GetPerfMonitorGroups([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) diff --git a/Source/OpenTK/Graphics/ES30/ES30.cs b/Source/OpenTK/Graphics/ES30/ES30.cs index 9d09f14b14..eee7b02d13 100644 --- a/Source/OpenTK/Graphics/ES30/ES30.cs +++ b/Source/OpenTK/Graphics/ES30/ES30.cs @@ -976,7 +976,7 @@ unsafe void GetPerfMonitorCounterString(UInt32 group, UInt32 counter, Int32 bufS /// [requires: AMD_performance_monitor] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -999,7 +999,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ /// [requires: AMD_performance_monitor] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out Int32 groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out Int32 groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -1024,7 +1024,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -1048,7 +1048,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out UInt32 groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out UInt32 groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -1073,7 +1073,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups) + unsafe void GetPerfMonitorGroups([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -1089,7 +1089,7 @@ unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSiz [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups) + unsafe void GetPerfMonitorGroups([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs index f3137005b3..b5ad1df303 100644 --- a/Source/OpenTK/Graphics/OpenGL/GL.cs +++ b/Source/OpenTK/Graphics/OpenGL/GL.cs @@ -2150,7 +2150,7 @@ unsafe void GetPerfMonitorCounterString(UInt32 group, UInt32 counter, Int32 bufS /// [requires: AMD_performance_monitor] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -2173,7 +2173,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ /// [requires: AMD_performance_monitor] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out Int32 groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out Int32 groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -2198,7 +2198,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -2222,7 +2222,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out UInt32 groups) + void GetPerfMonitorGroups([OutAttribute] out Int32 numGroups, Int32 groupsSize, [OutAttribute] out UInt32 groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -2247,7 +2247,7 @@ void GetPerfMonitorGroup([OutAttribute] out Int32 numGroups, Int32 groupsSize, [ [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups) + unsafe void GetPerfMonitorGroups([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -2263,7 +2263,7 @@ unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSiz [System.CLSCompliant(false)] [AutoGenerated(Category = "AMD_performance_monitor", Version = "", EntryPoint = "glGetPerfMonitorGroupsAMD")] public static - unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups) + unsafe void GetPerfMonitorGroups([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext))