ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-08 21:40:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move convenience overloads to generator

Browse source 
The generator now handles the creation of convenience overloads. These
must be removed from the helper classes to avoid redefinition errors.
This commit is contained in:
Stefanos A. 2013-11-10 15:36:53 +01:00
parent af7fdea449
commit 8003d06315
9 changed files with 98 additions and 321 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Source/OpenTK/Graphics/ES11/ES11.cs
View file

@ -3925,10 +3925,9 @@ namespace OpenTK.Graphics.ES11
/// Specifies an array in which the generated buffer object names are stored. /// Specifies an array in which the generated buffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_ES_CM_1_0", Version = "1.0", EntryPoint = "glGenBuffers")] [AutoGenerated(Category = "VERSION_ES_CM_1_0", Version = "1.0", EntryPoint = "glGenBuffers")]
public static public static
UInt32 GenBuffers() Int32 GenBuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -3937,8 +3936,8 @@ namespace OpenTK.Graphics.ES11
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* buffers = &retval; Int32* buffers = &retval;
Delegates.glGenBuffers((Int32)n, (UInt32*)buffers); Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
return retval; return retval;
} }
@ -4152,10 +4151,9 @@ namespace OpenTK.Graphics.ES11
/// Specifies an array in which the generated texture names are stored. /// Specifies an array in which the generated texture names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_ES_CM_1_0", Version = "1.0", EntryPoint = "glGenTextures")] [AutoGenerated(Category = "VERSION_ES_CM_1_0", Version = "1.0", EntryPoint = "glGenTextures")]
public static public static
UInt32 GenTextures() Int32 GenTexture()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -4164,8 +4162,8 @@ namespace OpenTK.Graphics.ES11
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* textures = &retval; Int32* textures = &retval;
Delegates.glGenTextures((Int32)n, (UInt32*)textures); Delegates.glGenTextures((Int32)n, (UInt32*)textures);
return retval; return retval;
} }

28
Source/OpenTK/Graphics/ES20/ES20.cs
View file

@ -7602,10 +7602,9 @@ namespace OpenTK.Graphics.ES20
/// Specifies an array in which the generated buffer object names are stored. /// Specifies an array in which the generated buffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenBuffers")] [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenBuffers")]
public static public static
UInt32 GenBuffers() Int32 GenBuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -7614,8 +7613,8 @@ namespace OpenTK.Graphics.ES20
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* buffers = &retval; Int32* buffers = &retval;
Delegates.glGenBuffers((Int32)n, (UInt32*)buffers); Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
return retval; return retval;
} }
@ -7851,10 +7850,9 @@ namespace OpenTK.Graphics.ES20
/// Specifies an array in which the generated framebuffer object names are stored. /// Specifies an array in which the generated framebuffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenFramebuffers")] [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenFramebuffers")]
public static public static
UInt32 GenFramebuffers() Int32 GenFramebuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -7863,8 +7861,8 @@ namespace OpenTK.Graphics.ES20
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* framebuffers = &retval; Int32* framebuffers = &retval;
Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers); Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers);
return retval; return retval;
} }
@ -8078,10 +8076,9 @@ namespace OpenTK.Graphics.ES20
/// Specifies an array in which the generated renderbuffer object names are stored. /// Specifies an array in which the generated renderbuffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenRenderbuffers")] [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenRenderbuffers")]
public static public static
UInt32 GenRenderbuffers() Int32 GenRenderbuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -8090,8 +8087,8 @@ namespace OpenTK.Graphics.ES20
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* renderbuffers = &retval; Int32* renderbuffers = &retval;
Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers); Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers);
return retval; return retval;
} }
@ -8305,10 +8302,9 @@ namespace OpenTK.Graphics.ES20
/// Specifies an array in which the generated texture names are stored. /// Specifies an array in which the generated texture names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenTextures")] [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenTextures")]
public static public static
UInt32 GenTextures() Int32 GenTexture()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -8317,8 +8313,8 @@ namespace OpenTK.Graphics.ES20
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* textures = &retval; Int32* textures = &retval;
Delegates.glGenTextures((Int32)n, (UInt32*)textures); Delegates.glGenTextures((Int32)n, (UInt32*)textures);
return retval; return retval;
} }

11
Source/OpenTK/Graphics/ES20/Helper.cs
View file

@ -362,17 +362,6 @@ namespace OpenTK.Graphics.ES20
#endregion #endregion
#region public static int GenTexture()
public static int GenTexture()
{
int id;
GenTextures(1, out id);
return id;
}
#endregion
#region public static void DeleteTexture(int id) #region public static void DeleteTexture(int id)
public static void DeleteTexture(int id) public static void DeleteTexture(int id)

56
Source/OpenTK/Graphics/ES30/ES30.cs
View file

@ -9999,10 +9999,9 @@ namespace OpenTK.Graphics.ES30
/// Specifies an array in which the generated buffer object names are stored. /// Specifies an array in which the generated buffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenBuffers")] [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenBuffers")]
public static public static
UInt32 GenBuffers() Int32 GenBuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -10011,8 +10010,8 @@ namespace OpenTK.Graphics.ES30
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* buffers = &retval; Int32* buffers = &retval;
Delegates.glGenBuffers((Int32)n, (UInt32*)buffers); Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
return retval; return retval;
} }
@ -10248,10 +10247,9 @@ namespace OpenTK.Graphics.ES30
/// Specifies an array in which the generated framebuffer object names are stored. /// Specifies an array in which the generated framebuffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenFramebuffers")] [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenFramebuffers")]
public static public static
UInt32 GenFramebuffers() Int32 GenFramebuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -10260,8 +10258,8 @@ namespace OpenTK.Graphics.ES30
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* framebuffers = &retval; Int32* framebuffers = &retval;
Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers); Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers);
return retval; return retval;
} }
@ -10475,10 +10473,9 @@ namespace OpenTK.Graphics.ES30
/// Specifies an array in which the generated query object names are stored. /// Specifies an array in which the generated query object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenQueries")] [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenQueries")]
public static public static
UInt32 GenQueries() Int32 GenQuery()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -10487,8 +10484,8 @@ namespace OpenTK.Graphics.ES30
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* ids = &retval; Int32* ids = &retval;
Delegates.glGenQueries((Int32)n, (UInt32*)ids); Delegates.glGenQueries((Int32)n, (UInt32*)ids);
return retval; return retval;
} }
@ -10702,10 +10699,9 @@ namespace OpenTK.Graphics.ES30
/// Specifies an array in which the generated renderbuffer object names are stored. /// Specifies an array in which the generated renderbuffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenRenderbuffers")] [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenRenderbuffers")]
public static public static
UInt32 GenRenderbuffers() Int32 GenRenderbuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -10714,8 +10710,8 @@ namespace OpenTK.Graphics.ES30
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* renderbuffers = &retval; Int32* renderbuffers = &retval;
Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers); Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers);
return retval; return retval;
} }
@ -10929,10 +10925,9 @@ namespace OpenTK.Graphics.ES30
/// Specifies an array in which the generated sampler object names are stored. /// Specifies an array in which the generated sampler object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenSamplers")] [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenSamplers")]
public static public static
UInt32 GenSamplers() Int32 GenSampler()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -10941,8 +10936,8 @@ namespace OpenTK.Graphics.ES30
unsafe unsafe
{ {
const Int32 count = 1; const Int32 count = 1;
UInt32 retval; Int32 retval;
UInt32* samplers = &retval; Int32* samplers = &retval;
Delegates.glGenSamplers((Int32)count, (UInt32*)samplers); Delegates.glGenSamplers((Int32)count, (UInt32*)samplers);
return retval; return retval;
} }
@ -11156,10 +11151,9 @@ namespace OpenTK.Graphics.ES30
/// Specifies an array in which the generated texture names are stored. /// Specifies an array in which the generated texture names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenTextures")] [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGenTextures")]
public static public static
UInt32 GenTextures() Int32 GenTexture()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -11168,8 +11162,8 @@ namespace OpenTK.Graphics.ES30
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* textures = &retval; Int32* textures = &retval;
Delegates.glGenTextures((Int32)n, (UInt32*)textures); Delegates.glGenTextures((Int32)n, (UInt32*)textures);
return retval; return retval;
} }
@ -11383,10 +11377,9 @@ namespace OpenTK.Graphics.ES30
/// Specifies an array of into which the reserved names will be written. /// Specifies an array of into which the reserved names will be written.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenTransformFeedbacks")] [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenTransformFeedbacks")]
public static public static
UInt32 GenTransformFeedbacks() Int32 GenTransformFeedback()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -11395,8 +11388,8 @@ namespace OpenTK.Graphics.ES30
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* ids = &retval; Int32* ids = &retval;
Delegates.glGenTransformFeedbacks((Int32)n, (UInt32*)ids); Delegates.glGenTransformFeedbacks((Int32)n, (UInt32*)ids);
return retval; return retval;
} }
@ -11610,10 +11603,9 @@ namespace OpenTK.Graphics.ES30
/// Specifies an array in which the generated vertex array object names are stored. /// Specifies an array in which the generated vertex array object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenVertexArrays")] [AutoGenerated(Category = "ES_VERSION_3_0", Version = "3.0", EntryPoint = "glGenVertexArrays")]
public static public static
UInt32 GenVertexArrays() Int32 GenVertexArray()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -11622,8 +11614,8 @@ namespace OpenTK.Graphics.ES30
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* arrays = &retval; Int32* arrays = &retval;
Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays); Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays);
return retval; return retval;
} }

11
Source/OpenTK/Graphics/ES30/Helper.cs
View file

@ -353,17 +353,6 @@ namespace OpenTK.Graphics.ES30
#endregion #endregion
#region public static int GenTexture()
public static int GenTexture()
{
int id;
GenTextures(1, out id);
return id;
}
#endregion
#region public static void DeleteTexture(int id) #region public static void DeleteTexture(int id)
public static void DeleteTexture(int id) public static void DeleteTexture(int id)

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

@ -62332,10 +62332,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array in which the generated buffer object names are stored. /// Specifies an array in which the generated buffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glGenBuffers")] [AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glGenBuffers")]
public static public static
UInt32 GenBuffers() Int32 GenBuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -62344,8 +62343,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* buffers = &retval; Int32* buffers = &retval;
Delegates.glGenBuffers((Int32)n, (UInt32*)buffers); Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
return retval; return retval;
} }
@ -62581,10 +62580,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array in which the generated framebuffer object names are stored. /// Specifies an array in which the generated framebuffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_framebuffer_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenFramebuffers")] [AutoGenerated(Category = "ARB_framebuffer_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenFramebuffers")]
public static public static
UInt32 GenFramebuffers() Int32 GenFramebuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -62593,8 +62591,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* framebuffers = &retval; Int32* framebuffers = &retval;
Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers); Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers);
return retval; return retval;
} }
@ -62830,10 +62828,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array of into which the reserved names will be written. /// Specifies an array of into which the reserved names will be written.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_separate_shader_objects|VERSION_4_1", Version = "4.1", EntryPoint = "glGenProgramPipelines")] [AutoGenerated(Category = "ARB_separate_shader_objects|VERSION_4_1", Version = "4.1", EntryPoint = "glGenProgramPipelines")]
public static public static
UInt32 GenProgramPipelines() Int32 GenProgramPipeline()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -62842,8 +62839,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* pipelines = &retval; Int32* pipelines = &retval;
Delegates.glGenProgramPipelines((Int32)n, (UInt32*)pipelines); Delegates.glGenProgramPipelines((Int32)n, (UInt32*)pipelines);
return retval; return retval;
} }
@ -63057,10 +63054,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array in which the generated query object names are stored. /// Specifies an array in which the generated query object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glGenQueries")] [AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glGenQueries")]
public static public static
UInt32 GenQueries() Int32 GenQuery()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -63069,8 +63065,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* ids = &retval; Int32* ids = &retval;
Delegates.glGenQueries((Int32)n, (UInt32*)ids); Delegates.glGenQueries((Int32)n, (UInt32*)ids);
return retval; return retval;
} }
@ -63284,10 +63280,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array in which the generated renderbuffer object names are stored. /// Specifies an array in which the generated renderbuffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_framebuffer_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenRenderbuffers")] [AutoGenerated(Category = "ARB_framebuffer_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenRenderbuffers")]
public static public static
UInt32 GenRenderbuffers() Int32 GenRenderbuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -63296,8 +63291,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* renderbuffers = &retval; Int32* renderbuffers = &retval;
Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers); Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers);
return retval; return retval;
} }
@ -63511,10 +63506,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array in which the generated sampler object names are stored. /// Specifies an array in which the generated sampler object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGenSamplers")] [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGenSamplers")]
public static public static
UInt32 GenSamplers() Int32 GenSampler()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -63523,8 +63517,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 count = 1; const Int32 count = 1;
UInt32 retval; Int32 retval;
UInt32* samplers = &retval; Int32* samplers = &retval;
Delegates.glGenSamplers((Int32)count, (UInt32*)samplers); Delegates.glGenSamplers((Int32)count, (UInt32*)samplers);
return retval; return retval;
} }
@ -63738,10 +63732,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array in which the generated texture names are stored. /// Specifies an array in which the generated texture names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_1_1", Version = "1.1", EntryPoint = "glGenTextures")] [AutoGenerated(Category = "VERSION_1_1", Version = "1.1", EntryPoint = "glGenTextures")]
public static public static
UInt32 GenTextures() Int32 GenTexture()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -63750,8 +63743,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* textures = &retval; Int32* textures = &retval;
Delegates.glGenTextures((Int32)n, (UInt32*)textures); Delegates.glGenTextures((Int32)n, (UInt32*)textures);
return retval; return retval;
} }
@ -63965,10 +63958,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array of into which the reserved names will be written. /// Specifies an array of into which the reserved names will be written.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_transform_feedback2|VERSION_4_0", Version = "4.0", EntryPoint = "glGenTransformFeedbacks")] [AutoGenerated(Category = "ARB_transform_feedback2|VERSION_4_0", Version = "4.0", EntryPoint = "glGenTransformFeedbacks")]
public static public static
UInt32 GenTransformFeedbacks() Int32 GenTransformFeedback()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -63977,8 +63969,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* ids = &retval; Int32* ids = &retval;
Delegates.glGenTransformFeedbacks((Int32)n, (UInt32*)ids); Delegates.glGenTransformFeedbacks((Int32)n, (UInt32*)ids);
return retval; return retval;
} }
@ -64192,10 +64184,9 @@ namespace OpenTK.Graphics.OpenGL
/// Specifies an array in which the generated vertex array object names are stored. /// Specifies an array in which the generated vertex array object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_vertex_array_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenVertexArrays")] [AutoGenerated(Category = "ARB_vertex_array_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenVertexArrays")]
public static public static
UInt32 GenVertexArrays() Int32 GenVertexArray()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -64204,8 +64195,8 @@ namespace OpenTK.Graphics.OpenGL
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* arrays = &retval; Int32* arrays = &retval;
Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays); Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays);
return retval; return retval;
} }

162
Source/OpenTK/Graphics/OpenGL/GLHelper.cs
View file

@ -934,21 +934,6 @@ namespace OpenTK.Graphics.OpenGL
#endregion #endregion
#region GenBuffer
/// <summary>[requires: v1.5]
/// Generates a single buffer object name
/// </summary>
/// <returns>The generated buffer object name</returns>
public static int GenBuffer()
{
int id;
GenBuffers(1, out id);
return id;
}
#endregion
#region DeleteBuffer #region DeleteBuffer
/// <summary>[requires: v1.5] /// <summary>[requires: v1.5]
@ -972,21 +957,6 @@ namespace OpenTK.Graphics.OpenGL
#endregion #endregion
#region GenFramebuffer
/// <summary>[requires: v3.0 and ARB_framebuffer_object]
/// Generates a single framebuffer object name
/// </summary>
/// <returns>The generated framebuffer object name</returns>
public static int GenFramebuffer()
{
int id;
GenFramebuffers(1, out id);
return id;
}
#endregion
#region DeleteFramebuffer #region DeleteFramebuffer
/// <summary>[requires: v3.0 and ARB_framebuffer_object] /// <summary>[requires: v3.0 and ARB_framebuffer_object]
@ -1010,21 +980,6 @@ namespace OpenTK.Graphics.OpenGL
#endregion #endregion
#region GenProgramPipeline
/// <summary>[requires: v4.1 and ARB_separate_shader_objects]
/// Generates a single single pipeline object name
/// </summary>
/// <returns>The generated single pipeline object name</returns>
public static int GenProgramPipeline()
{
int id;
GenProgramPipelines(1, out id);
return id;
}
#endregion
#region DeleteProgramPipeline #region DeleteProgramPipeline
/// <summary>[requires: v4.1 and ARB_separate_shader_objects] /// <summary>[requires: v4.1 and ARB_separate_shader_objects]
@ -1048,59 +1003,6 @@ namespace OpenTK.Graphics.OpenGL
#endregion #endregion
#region GenQuery
/// <summary>[requires: v1.5]
/// Generates a single query object name
/// </summary>
/// <returns>The generated query object name</returns>
public static int GenQuery()
{
int id;
GenQueries(1, out id);
return id;
}
#endregion
#region DeleteQuery
/// <summary>[requires: v1.5]
/// Deletes a single query object
/// </summary>
/// <param name="id">The query object to be deleted</param>
public static void DeleteQuery(int id)
{
DeleteQueries(1, ref id);
}
/// <summary>
/// Deletes a single query object
/// </summary>
/// <param name="id">The query object to be deleted</param>
[CLSCompliant(false)]
public static void DeleteQuery(uint id)
{
DeleteQueries(1, ref id);
}
#endregion
#region GenRenderbuffer
/// <summary>[requires: v3.0 and ARB_framebuffer_object]
/// Generates a single renderbuffer object name
/// </summary>
/// <returns>The generated renderbuffer object name</returns>
public static int GenRenderbuffer()
{
int id;
GenRenderbuffers(1, out id);
return id;
}
#endregion
#region DeleteRenderbuffer #region DeleteRenderbuffer
/// <summary>[requires: v3.0 and ARB_framebuffer_object] /// <summary>[requires: v3.0 and ARB_framebuffer_object]
@ -1124,21 +1026,6 @@ namespace OpenTK.Graphics.OpenGL
#endregion #endregion
#region GenSampler
/// <summary>
/// Generates a single sampler object name
/// </summary>
/// <returns>The generated sampler object name</returns>
public static int GenSampler()
{
int id;
GenSamplers(1, out id);
return id;
}
#endregion
#region DeleteSampler #region DeleteSampler
/// <summary> /// <summary>
@ -1162,21 +1049,6 @@ namespace OpenTK.Graphics.OpenGL
#endregion #endregion
#region GenTexture
/// <summary>[requires: v1.1]
/// Generate a single texture name
/// </summary>
/// <returns>The generated texture name</returns>
public static int GenTexture()
{
int id;
GenTextures(1, out id);
return id;
}
#endregion
#region DeleteTexture #region DeleteTexture
/// <summary>[requires: v1.1] /// <summary>[requires: v1.1]
@ -1200,21 +1072,6 @@ namespace OpenTK.Graphics.OpenGL
#endregion #endregion
#region GenTransformFeedback
/// <summary>[requires: v1.2 and ARB_transform_feedback2]
/// Generates a single transform feedback object name
/// </summary>
/// <returns>The generated transform feedback object name</returns>
public static int GenTransformFeedback()
{
int id;
GenTransformFeedback(1, out id);
return id;
}
#endregion
#region DeleteTransformFeedback #region DeleteTransformFeedback
/// <summary>[requires: v1.2 and ARB_transform_feedback2] /// <summary>[requires: v1.2 and ARB_transform_feedback2]
@ -1223,7 +1080,7 @@ namespace OpenTK.Graphics.OpenGL
/// <param name="id">The transform feedback object to be deleted</param> /// <param name="id">The transform feedback object to be deleted</param>
public static void DeleteTransformFeedback(int id) public static void DeleteTransformFeedback(int id)
{ {
DeleteTransformFeedback(1, ref id); DeleteTransformFeedbacks(1, ref id);
} }
/// <summary>[requires: v1.2 and ARB_transform_feedback2] /// <summary>[requires: v1.2 and ARB_transform_feedback2]
@ -1233,22 +1090,7 @@ namespace OpenTK.Graphics.OpenGL
[CLSCompliant(false)] [CLSCompliant(false)]
public static void DeleteTransformFeedback(uint id) public static void DeleteTransformFeedback(uint id)
{ {
DeleteTransformFeedback(1, ref id); DeleteTransformFeedbacks(1, ref id);
}
#endregion
#region GenVertexArray
/// <summary>[requires: v3.0 and ARB_vertex_array_object]
/// Generates a single vertex array object name
/// </summary>
/// <returns>The generated vertex array object name</returns>
public static int GenVertexArray()
{
int id;
GenVertexArrays(1, out id);
return id;
} }
#endregion #endregion

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

@ -23384,10 +23384,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array in which the generated buffer object names are stored. /// Specifies an array in which the generated buffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glGenBuffers")] [AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glGenBuffers")]
public static public static
UInt32 GenBuffers() Int32 GenBuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -23396,8 +23395,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* buffers = &retval; Int32* buffers = &retval;
Delegates.glGenBuffers((Int32)n, (UInt32*)buffers); Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
return retval; return retval;
} }
@ -23633,10 +23632,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array in which the generated framebuffer object names are stored. /// Specifies an array in which the generated framebuffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_framebuffer_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenFramebuffers")] [AutoGenerated(Category = "ARB_framebuffer_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenFramebuffers")]
public static public static
UInt32 GenFramebuffers() Int32 GenFramebuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -23645,8 +23643,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* framebuffers = &retval; Int32* framebuffers = &retval;
Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers); Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers);
return retval; return retval;
} }
@ -23860,10 +23858,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array of into which the reserved names will be written. /// Specifies an array of into which the reserved names will be written.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_separate_shader_objects|VERSION_4_1", Version = "4.1", EntryPoint = "glGenProgramPipelines")] [AutoGenerated(Category = "ARB_separate_shader_objects|VERSION_4_1", Version = "4.1", EntryPoint = "glGenProgramPipelines")]
public static public static
UInt32 GenProgramPipelines() Int32 GenProgramPipeline()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -23872,8 +23869,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* pipelines = &retval; Int32* pipelines = &retval;
Delegates.glGenProgramPipelines((Int32)n, (UInt32*)pipelines); Delegates.glGenProgramPipelines((Int32)n, (UInt32*)pipelines);
return retval; return retval;
} }
@ -24087,10 +24084,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array in which the generated query object names are stored. /// Specifies an array in which the generated query object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glGenQueries")] [AutoGenerated(Category = "VERSION_1_5", Version = "1.5", EntryPoint = "glGenQueries")]
public static public static
UInt32 GenQueries() Int32 GenQuery()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -24099,8 +24095,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* ids = &retval; Int32* ids = &retval;
Delegates.glGenQueries((Int32)n, (UInt32*)ids); Delegates.glGenQueries((Int32)n, (UInt32*)ids);
return retval; return retval;
} }
@ -24314,10 +24310,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array in which the generated renderbuffer object names are stored. /// Specifies an array in which the generated renderbuffer object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_framebuffer_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenRenderbuffers")] [AutoGenerated(Category = "ARB_framebuffer_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenRenderbuffers")]
public static public static
UInt32 GenRenderbuffers() Int32 GenRenderbuffer()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -24326,8 +24321,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* renderbuffers = &retval; Int32* renderbuffers = &retval;
Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers); Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers);
return retval; return retval;
} }
@ -24541,10 +24536,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array in which the generated sampler object names are stored. /// Specifies an array in which the generated sampler object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGenSamplers")] [AutoGenerated(Category = "ARB_sampler_objects|VERSION_3_3", Version = "3.3", EntryPoint = "glGenSamplers")]
public static public static
UInt32 GenSamplers() Int32 GenSampler()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -24553,8 +24547,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 count = 1; const Int32 count = 1;
UInt32 retval; Int32 retval;
UInt32* samplers = &retval; Int32* samplers = &retval;
Delegates.glGenSamplers((Int32)count, (UInt32*)samplers); Delegates.glGenSamplers((Int32)count, (UInt32*)samplers);
return retval; return retval;
} }
@ -24768,10 +24762,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array in which the generated texture names are stored. /// Specifies an array in which the generated texture names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "VERSION_1_1", Version = "1.1", EntryPoint = "glGenTextures")] [AutoGenerated(Category = "VERSION_1_1", Version = "1.1", EntryPoint = "glGenTextures")]
public static public static
UInt32 GenTextures() Int32 GenTexture()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -24780,8 +24773,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* textures = &retval; Int32* textures = &retval;
Delegates.glGenTextures((Int32)n, (UInt32*)textures); Delegates.glGenTextures((Int32)n, (UInt32*)textures);
return retval; return retval;
} }
@ -24995,10 +24988,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array of into which the reserved names will be written. /// Specifies an array of into which the reserved names will be written.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_transform_feedback2|VERSION_4_0", Version = "4.0", EntryPoint = "glGenTransformFeedbacks")] [AutoGenerated(Category = "ARB_transform_feedback2|VERSION_4_0", Version = "4.0", EntryPoint = "glGenTransformFeedbacks")]
public static public static
UInt32 GenTransformFeedbacks() Int32 GenTransformFeedback()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -25007,8 +24999,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* ids = &retval; Int32* ids = &retval;
Delegates.glGenTransformFeedbacks((Int32)n, (UInt32*)ids); Delegates.glGenTransformFeedbacks((Int32)n, (UInt32*)ids);
return retval; return retval;
} }
@ -25222,10 +25214,9 @@ namespace OpenTK.Graphics.OpenGL4
/// Specifies an array in which the generated vertex array object names are stored. /// Specifies an array in which the generated vertex array object names are stored.
/// </para> /// </para>
/// </param> /// </param>
[System.CLSCompliant(false)]
[AutoGenerated(Category = "ARB_vertex_array_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenVertexArrays")] [AutoGenerated(Category = "ARB_vertex_array_object|VERSION_3_0", Version = "3.0", EntryPoint = "glGenVertexArrays")]
public static public static
UInt32 GenVertexArrays() Int32 GenVertexArray()
{ {
#if DEBUG #if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext)) using (new ErrorHelper(GraphicsContext.CurrentContext))
@ -25234,8 +25225,8 @@ namespace OpenTK.Graphics.OpenGL4
unsafe unsafe
{ {
const Int32 n = 1; const Int32 n = 1;
UInt32 retval; Int32 retval;
UInt32* arrays = &retval; Int32* arrays = &retval;
Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays); Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays);
return retval; return retval;
} }

11
Source/OpenTK/Graphics/OpenGL4/Helper.cs
View file

@ -362,17 +362,6 @@ namespace OpenTK.Graphics.OpenGL4
#endregion #endregion
#region public static int GenTexture()
public static int GenTexture()
{
int id;
GenTextures(1, out id);
return id;
}
#endregion
#region public static void DeleteTexture(int id) #region public static void DeleteTexture(int id)
public static void DeleteTexture(int id) public static void DeleteTexture(int id)