Fix BlueLine merge

This commit is contained in:
Ethan Lee 2014-05-05 10:24:26 -04:00
parent b4ccfe1c96
commit a7fe72d17a
2 changed files with 1 additions and 40 deletions

View file

@ -114563,43 +114563,6 @@ namespace OpenTK.Graphics.OpenGL
#endif
}
/// <summary>[requires: EXT_framebuffer_blit]
/// Copy a block of pixels from the read framebuffer to the draw framebuffer
/// </summary>
/// <param name="srcX0">
/// <para>
/// Specify the bounds of the source rectangle within the read buffer of the read framebuffer.
/// </para>
/// </param>
/// <param name="dstX0">
/// <para>
/// Specify the bounds of the destination rectangle within the write buffer of the write framebuffer.
/// </para>
/// </param>
/// <param name="mask">
/// <para>
/// The bitwise OR of the flags indicating which buffers are to be copied. The allowed flags are GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT and GL_STENCIL_BUFFER_BIT.
/// </para>
/// </param>
/// <param name="filter">
/// <para>
/// Specifies the interpolation to be applied if the image is stretched. Must be GL_NEAREST or GL_LINEAR.
/// </para>
/// </param>
[AutoGenerated(Category = "EXT_framebuffer_blit", Version = "1.5", EntryPoint = "glBlitFramebufferEXT")]
public static
void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.OpenGL.ClearBufferMask mask, OpenTK.Graphics.OpenGL.ExtFramebufferBlit filter)
{
#if DEBUG
using (new ErrorHelper(GraphicsContext.CurrentContext))
{
#endif
Delegates.glBlitFramebufferEXT((Int32)srcX0, (Int32)srcY0, (Int32)srcX1, (Int32)srcY1, (Int32)dstX0, (Int32)dstY0, (Int32)dstX1, (Int32)dstY1, (OpenTK.Graphics.OpenGL.ClearBufferMask)mask, (OpenTK.Graphics.OpenGL.ExtFramebufferBlit)filter);
#if DEBUG
}
#endif
}
/// <summary>[requires: EXT_framebuffer_blit]
/// Copy a block of pixels from the read framebuffer to the draw framebuffer
@ -194029,4 +193992,4 @@ namespace OpenTK.Graphics.OpenGL
}
// flibit added this!
#pragma warning restore 3021
#pragma warning restore 3021

View file

@ -369,8 +369,6 @@ namespace OpenTK.Graphics.OpenGL
internal delegate void BlitFramebuffer(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.OpenGL.ClearBufferMask mask, OpenTK.Graphics.OpenGL.BlitFramebufferFilter filter);
internal static BlitFramebuffer glBlitFramebuffer;
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void BlitFramebufferEXT(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.OpenGL.ClearBufferMask mask, OpenTK.Graphics.OpenGL.ExtFramebufferBlit filter);
[System.Security.SuppressUnmanagedCodeSecurity()]
internal delegate void BlitFramebufferEXT(Int32 srcX0, Int32 srcY0, Int32 srcX1, Int32 srcY1, Int32 dstX0, Int32 dstY0, Int32 dstX1, Int32 dstY1, OpenTK.Graphics.OpenGL.ClearBufferMask mask, OpenTK.Graphics.OpenGL.BlitFramebufferFilter filter);
internal static BlitFramebufferEXT glBlitFramebufferEXT;
[System.Security.SuppressUnmanagedCodeSecurity()]