mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-25 04:06:08 +00:00
Push/Pop AttribMask.ColorBufferBit in TextPrinter.Begin/End
float[] viewport should have 4 members, not 6.
This commit is contained in:
parent
c79f4abbe9
commit
9d1f1ecc4c
|
@ -29,7 +29,7 @@ namespace OpenTK.Graphics
|
|||
//static char[] split_chars = new char[] { ' ', '\n', '\t', ',', '.', '/', '?', '!', ';', '\\', '-', '+', '*', '=' };
|
||||
static bool functionality_checked = false;
|
||||
static ITextPrinterImplementation printer;
|
||||
float[] viewport = new float[6];
|
||||
float[] viewport = new float[4];
|
||||
// 8 chars by default
|
||||
Vector2[] vertices = new Vector2[8 * 8]; // Interleaved, vertex, texcoord, vertex, etc...
|
||||
ushort[] indices = new ushort[6 * 8];
|
||||
|
@ -307,6 +307,7 @@ namespace OpenTK.Graphics
|
|||
|
||||
GL.PushAttrib(AttribMask.TextureBit);
|
||||
GL.PushAttrib(AttribMask.EnableBit);
|
||||
GL.PushAttrib(AttribMask.ColorBufferBit);
|
||||
|
||||
GL.Enable(EnableCap.Texture2D);
|
||||
GL.Enable(EnableCap.Blend);
|
||||
|
@ -326,6 +327,7 @@ namespace OpenTK.Graphics
|
|||
{
|
||||
GL.PopAttrib();
|
||||
GL.PopAttrib();
|
||||
GL.PopAttrib();
|
||||
|
||||
GL.MatrixMode(MatrixMode.Modelview);
|
||||
GL.PopMatrix();
|
||||
|
|
Loading…
Reference in a new issue