ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 11:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #414 from cra0zy/temp

Browse source 
Extracted commits from #311
This commit is contained in:
Harry 2016-07-16 13:20:33 +02:00 committed by GitHub
parent 6f12ddd31c dde2da6c00
commit da0cda28b4
6 changed files with 75 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Source/Bind/Specifications/GL2/overrides.xml
View file

@ -186,6 +186,15 @@
</param>
</function>
<function name="DrawElements" extension="Core">
<param name="mode">
<type>PrimitiveType</type>
</param>
<param name="type">
<type>DrawElementsType</type>
</param>
</function>
<function name="StencilFuncSeparate" extension="Core">
<param name="face">
<type>StencilFace</type>
@ -490,6 +499,9 @@
<param name="mode">
<type>PrimitiveType</type>
</param>
<param name="type">
<type>DrawElementsType</type>
</param>
</function>
<function name="DrawElementsInstancedBaseVertex" extension="Core">
@ -497,6 +509,9 @@
<param name="mode">
<type>PrimitiveType</type>
</param>
<param name="type">
<type>DrawElementsType</type>
</param>
</function>
<function name="DrawRangeElementsBaseVertex" extension="Core">
@ -504,6 +519,9 @@
<param name="mode">
<type>PrimitiveType</type>
</param>
<param name="type">
<type>DrawElementsType</type>
</param>
</function>
<function name="GetInteger64v" extension="Core">
@ -518,6 +536,9 @@
<param name="mode">
<type>PrimitiveType</type>
</param>
<param name="type">
<type>DrawElementsType</type>
</param>
</function>
<function name="TexImage2DMultisample" extension="Core">
@ -1151,6 +1172,15 @@
</param>
</function>
<function name="MultiDrawElementsIndirect" extension="Core">
<param name="mode">
<type>PrimitiveType</type>
</param>
<param name="type">
<type>DrawElementsType</type>
</param>
</function>
<function name="ObjectLabel" extension="Core">
<param name="identifier">
<type>ObjectLabelIdentifier</type>
@ -2881,6 +2911,7 @@
<token name="BUFFER_MAP_POINTER" value="0x88BD" />
</enum>
<enum name="BufferStorageFlags">
<use enum="VERSION_1_1" token="NONE" />
<use enum="VERSION_3_0" token="MAP_READ_BIT" />
<use enum="VERSION_3_0" token="MAP_WRITE_BIT" />
<use enum="VERSION_4_4" token="CLIENT_STORAGE_BIT" />

10
Source/OpenTK/Graphics/OpenGL/GL.cs
View file

@ -54281,7 +54281,7 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies the distance in basic machine units between elements of the draw parameter array.
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
public static void MultiDrawElementsIndirect(OpenTK.Graphics.OpenGL.All mode, OpenTK.Graphics.OpenGL.All type, IntPtr indirect, Int32 drawcount, Int32 stride) { throw new NotImplementedException(); }
public static void MultiDrawElementsIndirect(OpenTK.Graphics.OpenGL.PrimitiveType mode, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indirect, Int32 drawcount, Int32 stride) { throw new NotImplementedException(); }
/// <summary>[requires: v4.3 or ARB_multi_draw_indirect|VERSION_4_3]
/// Render indexed primitives from array data, taking parameters from memory
@ -54303,7 +54303,7 @@ namespace OpenTK.Graphics.OpenGL
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
[CLSCompliant(false)]
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL.All mode, OpenTK.Graphics.OpenGL.All type, [InAttribute, OutAttribute] T2[] indirect, Int32 drawcount, Int32 stride)
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL.PrimitiveType mode, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T2[] indirect, Int32 drawcount, Int32 stride)
where T2 : struct
{ throw new NotImplementedException(); }
@ -54327,7 +54327,7 @@ namespace OpenTK.Graphics.OpenGL
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
[CLSCompliant(false)]
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL.All mode, OpenTK.Graphics.OpenGL.All type, [InAttribute, OutAttribute] T2[,] indirect, Int32 drawcount, Int32 stride)
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL.PrimitiveType mode, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T2[,] indirect, Int32 drawcount, Int32 stride)
where T2 : struct
{ throw new NotImplementedException(); }
@ -54351,7 +54351,7 @@ namespace OpenTK.Graphics.OpenGL
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
[CLSCompliant(false)]
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL.All mode, OpenTK.Graphics.OpenGL.All type, [InAttribute, OutAttribute] T2[,,] indirect, Int32 drawcount, Int32 stride)
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL.PrimitiveType mode, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T2[,,] indirect, Int32 drawcount, Int32 stride)
where T2 : struct
{ throw new NotImplementedException(); }
@ -54374,7 +54374,7 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies the distance in basic machine units between elements of the draw parameter array.
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL.All mode, OpenTK.Graphics.OpenGL.All type, [InAttribute, OutAttribute] ref T2 indirect, Int32 drawcount, Int32 stride)
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL.PrimitiveType mode, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T2 indirect, Int32 drawcount, Int32 stride)
where T2 : struct
{ throw new NotImplementedException(); }

10
Source/OpenTK/Graphics/OpenGL/GLEnums.cs
View file

@ -740,7 +740,7 @@ namespace OpenTK.Graphics.OpenGL
}
/// <summary>
/// Used in GL.Arb.GetProgramEnvParameter, GL.Arb.GetProgramLocalParameter and 14 other functions
/// Used in GL.Arb.GetProgramEnvParameter, GL.Arb.GetProgramLocalParameter and 13 other functions
/// </summary>
public enum All : int
{
@ -29585,6 +29585,10 @@ namespace OpenTK.Graphics.OpenGL
/// </summary>
public enum BufferStorageFlags : int
{
/// <summary>
/// Original was GL_NONE = 0
/// </summary>
None = ((int)0),
/// <summary>
/// Original was GL_MAP_READ_BIT = 0x0001
/// </summary>
@ -30973,7 +30977,7 @@ namespace OpenTK.Graphics.OpenGL
}
/// <summary>
/// Used in GL.Arb.DrawElementsInstanced, GL.DrawElements and 13 other functions
/// Used in GL.Arb.DrawElementsInstanced, GL.DrawElements and 14 other functions
/// </summary>
public enum DrawElementsType : int
{
@ -48946,7 +48950,7 @@ namespace OpenTK.Graphics.OpenGL
}
/// <summary>
/// Used in GL.Apple.DrawElementArray, GL.Apple.DrawRangeElementArray and 38 other functions
/// Used in GL.Apple.DrawElementArray, GL.Apple.DrawRangeElementArray and 39 other functions
/// </summary>
public enum PrimitiveType : int
{

10
Source/OpenTK/Graphics/OpenGL4/GL4.cs
View file

@ -28379,7 +28379,7 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies the distance in basic machine units between elements of the draw parameter array.
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
public static void MultiDrawElementsIndirect(OpenTK.Graphics.OpenGL4.All mode, OpenTK.Graphics.OpenGL4.All type, IntPtr indirect, Int32 drawcount, Int32 stride) { throw new NotImplementedException(); }
public static void MultiDrawElementsIndirect(OpenTK.Graphics.OpenGL4.PrimitiveType mode, OpenTK.Graphics.OpenGL4.DrawElementsType type, IntPtr indirect, Int32 drawcount, Int32 stride) { throw new NotImplementedException(); }
/// <summary>[requires: v4.3 or ARB_multi_draw_indirect|VERSION_4_3]
/// Render indexed primitives from array data, taking parameters from memory
@ -28401,7 +28401,7 @@ namespace OpenTK.Graphics.OpenGL4
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
[CLSCompliant(false)]
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL4.All mode, OpenTK.Graphics.OpenGL4.All type, [InAttribute, OutAttribute] T2[] indirect, Int32 drawcount, Int32 stride)
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL4.PrimitiveType mode, OpenTK.Graphics.OpenGL4.DrawElementsType type, [InAttribute, OutAttribute] T2[] indirect, Int32 drawcount, Int32 stride)
where T2 : struct
{ throw new NotImplementedException(); }
@ -28425,7 +28425,7 @@ namespace OpenTK.Graphics.OpenGL4
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
[CLSCompliant(false)]
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL4.All mode, OpenTK.Graphics.OpenGL4.All type, [InAttribute, OutAttribute] T2[,] indirect, Int32 drawcount, Int32 stride)
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL4.PrimitiveType mode, OpenTK.Graphics.OpenGL4.DrawElementsType type, [InAttribute, OutAttribute] T2[,] indirect, Int32 drawcount, Int32 stride)
where T2 : struct
{ throw new NotImplementedException(); }
@ -28449,7 +28449,7 @@ namespace OpenTK.Graphics.OpenGL4
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
[CLSCompliant(false)]
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL4.All mode, OpenTK.Graphics.OpenGL4.All type, [InAttribute, OutAttribute] T2[,,] indirect, Int32 drawcount, Int32 stride)
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL4.PrimitiveType mode, OpenTK.Graphics.OpenGL4.DrawElementsType type, [InAttribute, OutAttribute] T2[,,] indirect, Int32 drawcount, Int32 stride)
where T2 : struct
{ throw new NotImplementedException(); }
@ -28472,7 +28472,7 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies the distance in basic machine units between elements of the draw parameter array.
/// </param>
[AutoGenerated(Category = "ARB_multi_draw_indirect|VERSION_4_3", Version = "4.3", EntryPoint = "glMultiDrawElementsIndirect")]
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL4.All mode, OpenTK.Graphics.OpenGL4.All type, [InAttribute, OutAttribute] ref T2 indirect, Int32 drawcount, Int32 stride)
public static void MultiDrawElementsIndirect<T2>(OpenTK.Graphics.OpenGL4.PrimitiveType mode, OpenTK.Graphics.OpenGL4.DrawElementsType type, [InAttribute, OutAttribute] ref T2 indirect, Int32 drawcount, Int32 stride)
where T2 : struct
{ throw new NotImplementedException(); }

10
Source/OpenTK/Graphics/OpenGL4/GL4Enums.cs
View file

@ -720,7 +720,7 @@ namespace OpenTK.Graphics.OpenGL4
}
/// <summary>
/// Used in GL.Arb.BlendEquationSeparate, GL.Arb.BlendFunc and 48 other functions
/// Used in GL.Arb.BlendEquationSeparate, GL.Arb.BlendFunc and 47 other functions
/// </summary>
public enum All : int
{
@ -15632,6 +15632,10 @@ namespace OpenTK.Graphics.OpenGL4
/// </summary>
public enum BufferStorageFlags : int
{
/// <summary>
/// Original was GL_NONE = 0
/// </summary>
None = ((int)0),
/// <summary>
/// Original was GL_MAP_READ_BIT = 0x0001
/// </summary>
@ -16948,7 +16952,7 @@ namespace OpenTK.Graphics.OpenGL4
}
/// <summary>
/// Used in GL.DrawElements, GL.DrawElementsBaseVertex and 8 other functions
/// Used in GL.DrawElements, GL.DrawElementsBaseVertex and 9 other functions
/// </summary>
public enum DrawElementsType : int
{
@ -25281,7 +25285,7 @@ namespace OpenTK.Graphics.OpenGL4
}
/// <summary>
/// Used in GL.DrawArrays, GL.DrawArraysIndirect and 19 other functions
/// Used in GL.DrawArrays, GL.DrawArraysIndirect and 20 other functions
/// </summary>
public enum PrimitiveType : int
{

40
Source/Tests/Test.API.Desktop/api.cs
View file

@ -25516,40 +25516,40 @@ static unsafe void Test_MultiDrawElementsBaseVertex_21637() {
OpenTK.Graphics.OpenGL.GL.MultiDrawElementsBaseVertex<int>(_mode,_count,_type,ref _indices,_drawcount,_basevertex);
}
static unsafe void Test_MultiDrawElementsIndirect_21638() {
OpenTK.Graphics.OpenGL.All _mode = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.All _type = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL.PrimitiveType);
OpenTK.Graphics.OpenGL.DrawElementsType _type = default(OpenTK.Graphics.OpenGL.DrawElementsType);
System.IntPtr _indirect = default(System.IntPtr);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
OpenTK.Graphics.OpenGL.GL.MultiDrawElementsIndirect(_mode,_type,_indirect,_drawcount,_stride);
}
static unsafe void Test_MultiDrawElementsIndirect_21639() {
OpenTK.Graphics.OpenGL.All _mode = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.All _type = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL.PrimitiveType);
OpenTK.Graphics.OpenGL.DrawElementsType _type = default(OpenTK.Graphics.OpenGL.DrawElementsType);
int[] _indirect = default(int[]);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
OpenTK.Graphics.OpenGL.GL.MultiDrawElementsIndirect<int>(_mode,_type,_indirect,_drawcount,_stride);
}
static unsafe void Test_MultiDrawElementsIndirect_21640() {
OpenTK.Graphics.OpenGL.All _mode = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.All _type = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL.PrimitiveType);
OpenTK.Graphics.OpenGL.DrawElementsType _type = default(OpenTK.Graphics.OpenGL.DrawElementsType);
int[,] _indirect = default(int[,]);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
OpenTK.Graphics.OpenGL.GL.MultiDrawElementsIndirect<int>(_mode,_type,_indirect,_drawcount,_stride);
}
static unsafe void Test_MultiDrawElementsIndirect_21641() {
OpenTK.Graphics.OpenGL.All _mode = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.All _type = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL.PrimitiveType);
OpenTK.Graphics.OpenGL.DrawElementsType _type = default(OpenTK.Graphics.OpenGL.DrawElementsType);
int[,,] _indirect = default(int[,,]);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
OpenTK.Graphics.OpenGL.GL.MultiDrawElementsIndirect<int>(_mode,_type,_indirect,_drawcount,_stride);
}
static unsafe void Test_MultiDrawElementsIndirect_21642() {
OpenTK.Graphics.OpenGL.All _mode = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.All _type = default(OpenTK.Graphics.OpenGL.All);
OpenTK.Graphics.OpenGL.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL.PrimitiveType);
OpenTK.Graphics.OpenGL.DrawElementsType _type = default(OpenTK.Graphics.OpenGL.DrawElementsType);
int _indirect = default(int);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
@ -122819,40 +122819,40 @@ static unsafe void Test_MultiDrawElementsBaseVertex_36197() {
OpenTK.Graphics.OpenGL4.GL.MultiDrawElementsBaseVertex<int>(_mode,_count,_type,ref _indices,_drawcount,_basevertex);
}
static unsafe void Test_MultiDrawElementsIndirect_36198() {
OpenTK.Graphics.OpenGL4.All _mode = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.All _type = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL4.PrimitiveType);
OpenTK.Graphics.OpenGL4.DrawElementsType _type = default(OpenTK.Graphics.OpenGL4.DrawElementsType);
System.IntPtr _indirect = default(System.IntPtr);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
OpenTK.Graphics.OpenGL4.GL.MultiDrawElementsIndirect(_mode,_type,_indirect,_drawcount,_stride);
}
static unsafe void Test_MultiDrawElementsIndirect_36199() {
OpenTK.Graphics.OpenGL4.All _mode = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.All _type = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL4.PrimitiveType);
OpenTK.Graphics.OpenGL4.DrawElementsType _type = default(OpenTK.Graphics.OpenGL4.DrawElementsType);
int[] _indirect = default(int[]);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
OpenTK.Graphics.OpenGL4.GL.MultiDrawElementsIndirect<int>(_mode,_type,_indirect,_drawcount,_stride);
}
static unsafe void Test_MultiDrawElementsIndirect_36200() {
OpenTK.Graphics.OpenGL4.All _mode = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.All _type = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL4.PrimitiveType);
OpenTK.Graphics.OpenGL4.DrawElementsType _type = default(OpenTK.Graphics.OpenGL4.DrawElementsType);
int[,] _indirect = default(int[,]);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
OpenTK.Graphics.OpenGL4.GL.MultiDrawElementsIndirect<int>(_mode,_type,_indirect,_drawcount,_stride);
}
static unsafe void Test_MultiDrawElementsIndirect_36201() {
OpenTK.Graphics.OpenGL4.All _mode = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.All _type = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL4.PrimitiveType);
OpenTK.Graphics.OpenGL4.DrawElementsType _type = default(OpenTK.Graphics.OpenGL4.DrawElementsType);
int[,,] _indirect = default(int[,,]);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);
OpenTK.Graphics.OpenGL4.GL.MultiDrawElementsIndirect<int>(_mode,_type,_indirect,_drawcount,_stride);
}
static unsafe void Test_MultiDrawElementsIndirect_36202() {
OpenTK.Graphics.OpenGL4.All _mode = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.All _type = default(OpenTK.Graphics.OpenGL4.All);
OpenTK.Graphics.OpenGL4.PrimitiveType _mode = default(OpenTK.Graphics.OpenGL4.PrimitiveType);
OpenTK.Graphics.OpenGL4.DrawElementsType _type = default(OpenTK.Graphics.OpenGL4.DrawElementsType);
int _indirect = default(int);
System.Int32 _drawcount = default(System.Int32);
System.Int32 _stride = default(System.Int32);