From 44560392b9957d89f1fd51366a1e9a02b6c983b9 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sat, 28 Mar 2009 14:48:20 +0000 Subject: [PATCH] Fixed Draw*Instanced (were missing the 'd' from Instanced). Bug [#586]. --- Source/Bind/Structures/Function.cs | 2 +- Source/OpenTK/Graphics/GL/GL.cs | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Bind/Structures/Function.cs b/Source/Bind/Structures/Function.cs index 6de13e14..0169322f 100644 --- a/Source/Bind/Structures/Function.cs +++ b/Source/Bind/Structures/Function.cs @@ -34,7 +34,7 @@ namespace Bind.Structures #endregion static Regex endings = new Regex(@"((([df]|u?[isb])v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft); - static Regex endingsNotToTrim = new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Flagv|Tess|Status|Pixels)", RegexOptions.Compiled | RegexOptions.RightToLeft); + static Regex endingsNotToTrim = new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Flagv|Tess|Status|Pixels|Instanced)", RegexOptions.Compiled | RegexOptions.RightToLeft); // Add a trailing v to functions matching this regex. Used to differntiate between overloads taking both // a 'type' and a 'ref type' (such overloads are not CLS Compliant). diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs index 4248f19e..bdb2638c 100644 --- a/Source/OpenTK/Graphics/GL/GL.cs +++ b/Source/OpenTK/Graphics/GL/GL.cs @@ -92093,7 +92093,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawArraysInstancedARB")] public static - void DrawArraysInstance(OpenTK.Graphics.BeginMode mode, Int32 first, Int32 count, Int32 primcount) + void DrawArraysInstanced(OpenTK.Graphics.BeginMode mode, Int32 first, Int32 count, Int32 primcount) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -92107,7 +92107,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, IntPtr indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, IntPtr indices, Int32 primcount) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -92121,7 +92121,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] ref T3 indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] ref T3 indices, Int32 primcount) where T3 : struct { #if DEBUG @@ -92144,7 +92144,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[] indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[] indices, Int32 primcount) where T3 : struct { #if DEBUG @@ -92167,7 +92167,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,] indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,] indices, Int32 primcount) where T3 : struct { #if DEBUG @@ -92190,7 +92190,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,,] indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,,] indices, Int32 primcount) where T3 : struct { #if DEBUG @@ -112989,7 +112989,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawArraysInstancedEXT")] public static - void DrawArraysInstance(OpenTK.Graphics.BeginMode mode, Int32 start, Int32 count, Int32 primcount) + void DrawArraysInstanced(OpenTK.Graphics.BeginMode mode, Int32 start, Int32 count, Int32 primcount) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -113003,7 +113003,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, IntPtr indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, IntPtr indices, Int32 primcount) { #if DEBUG using (new ErrorHelper(GraphicsContext.CurrentContext)) @@ -113017,7 +113017,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] ref T3 indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] ref T3 indices, Int32 primcount) where T3 : struct { #if DEBUG @@ -113040,7 +113040,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[] indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[] indices, Int32 primcount) where T3 : struct { #if DEBUG @@ -113063,7 +113063,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,] indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,] indices, Int32 primcount) where T3 : struct { #if DEBUG @@ -113086,7 +113086,7 @@ namespace OpenTK.Graphics [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")] public static - void DrawElementsInstance(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,,] indices, Int32 primcount) + void DrawElementsInstanced(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,,] indices, Int32 primcount) where T3 : struct { #if DEBUG