mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-25 18:05:37 +00:00
Fixed Draw*Instanced (were missing the 'd' from Instanced). Bug [#586].
This commit is contained in:
parent
9330ec16fe
commit
a2c1d83b04
|
@ -34,7 +34,7 @@ namespace Bind.Structures
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
static Regex endings = new Regex(@"((([df]|u?[isb])v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft);
|
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
|
// 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).
|
// a 'type' and a 'ref type' (such overloads are not CLS Compliant).
|
||||||
|
|
|
@ -92093,7 +92093,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawArraysInstancedARB")]
|
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawArraysInstancedARB")]
|
||||||
public static
|
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
|
#if DEBUG
|
||||||
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
||||||
|
@ -92107,7 +92107,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
||||||
public static
|
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
|
#if DEBUG
|
||||||
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
||||||
|
@ -92121,7 +92121,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
||||||
public static
|
public static
|
||||||
void DrawElementsInstance<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] ref T3 indices, Int32 primcount)
|
void DrawElementsInstanced<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] ref T3 indices, Int32 primcount)
|
||||||
where T3 : struct
|
where T3 : struct
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
@ -92144,7 +92144,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
||||||
public static
|
public static
|
||||||
void DrawElementsInstance<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[] indices, Int32 primcount)
|
void DrawElementsInstanced<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[] indices, Int32 primcount)
|
||||||
where T3 : struct
|
where T3 : struct
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
@ -92167,7 +92167,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
||||||
public static
|
public static
|
||||||
void DrawElementsInstance<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,] indices, Int32 primcount)
|
void DrawElementsInstanced<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,] indices, Int32 primcount)
|
||||||
where T3 : struct
|
where T3 : struct
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
@ -92190,7 +92190,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
[AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
|
||||||
public static
|
public static
|
||||||
void DrawElementsInstance<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,,] indices, Int32 primcount)
|
void DrawElementsInstanced<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,,] indices, Int32 primcount)
|
||||||
where T3 : struct
|
where T3 : struct
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
@ -112989,7 +112989,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawArraysInstancedEXT")]
|
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawArraysInstancedEXT")]
|
||||||
public static
|
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
|
#if DEBUG
|
||||||
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
||||||
|
@ -113003,7 +113003,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
||||||
public static
|
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
|
#if DEBUG
|
||||||
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
using (new ErrorHelper(GraphicsContext.CurrentContext))
|
||||||
|
@ -113017,7 +113017,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
||||||
public static
|
public static
|
||||||
void DrawElementsInstance<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] ref T3 indices, Int32 primcount)
|
void DrawElementsInstanced<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] ref T3 indices, Int32 primcount)
|
||||||
where T3 : struct
|
where T3 : struct
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
@ -113040,7 +113040,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
||||||
public static
|
public static
|
||||||
void DrawElementsInstance<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[] indices, Int32 primcount)
|
void DrawElementsInstanced<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[] indices, Int32 primcount)
|
||||||
where T3 : struct
|
where T3 : struct
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
@ -113063,7 +113063,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
||||||
public static
|
public static
|
||||||
void DrawElementsInstance<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,] indices, Int32 primcount)
|
void DrawElementsInstanced<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,] indices, Int32 primcount)
|
||||||
where T3 : struct
|
where T3 : struct
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
@ -113086,7 +113086,7 @@ namespace OpenTK.Graphics
|
||||||
|
|
||||||
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
[AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
|
||||||
public static
|
public static
|
||||||
void DrawElementsInstance<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,,] indices, Int32 primcount)
|
void DrawElementsInstanced<T3>(OpenTK.Graphics.BeginMode mode, Int32 count, OpenTK.Graphics.DrawElementsType type, [In, Out] T3[,,] indices, Int32 primcount)
|
||||||
where T3 : struct
|
where T3 : struct
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
|
Loading…
Reference in a new issue