ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-05-14 20:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update VboTextPrinter to use the updated Buffer Object enums.

Browse source
This commit is contained in:
the_fiddler 2008-01-02 01:06:03 +00:00
parent 18296ea663
commit e5b5dba183
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/OpenTK/Fonts/TextPrinter.cs
View file

@ -45,9 +45,10 @@ namespace OpenTK.Fonts
/// </summary> /// </summary>
static void CheckNeededFunctionality() static void CheckNeededFunctionality()
{ {
printer = new DisplayListTextPrinter(); printer = (ITextPrinterImplementation)new DisplayListTextPrinter();
/* /*
GL.SupportsExtension("VERSION_1_5") ? new VboTextPrinter() : GL.SupportsExtension("VERSION_1_5") ?
(ITextPrinterImplementation)new VboTextPrinter() :
GL.SupportsExtension("ARB_vertex_buffer_object") ? null : GL.SupportsExtension("ARB_vertex_buffer_object") ? null :
GL.SupportsExtension("VERSION_1_1") ? null : null; GL.SupportsExtension("VERSION_1_1") ? null : null;
*/ */

24
Source/OpenTK/Fonts/VboTextPrinter.cs
View file

@ -30,16 +30,16 @@ namespace OpenTK.Fonts
VboTextHandle handle = new VboTextHandle(++allocated_handles); VboTextHandle handle = new VboTextHandle(++allocated_handles);
GL.GenBuffers(1, out handle.vbo_id); GL.GenBuffers(1, out handle.vbo_id);
GL.BindBuffer(Version15.ArrayBuffer, handle.vbo_id); GL.BindBuffer(BufferTarget.ArrayBuffer, handle.vbo_id);
GL.BufferData(Version15.ArrayBuffer, (IntPtr)(vertices.Length * vector2_size), vertices, GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(vertices.Length * vector2_size), vertices,
Version15.StaticDraw); BufferUsageHint.StaticDraw);
GL.BindBuffer(Version15.ArrayBuffer, 0); GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
GL.GenBuffers(1, out handle.ebo_id); GL.GenBuffers(1, out handle.ebo_id);
GL.BindBuffer(Version15.ElementArrayBuffer, handle.ebo_id); GL.BindBuffer(BufferTarget.ElementArrayBuffer, handle.ebo_id);
GL.BufferData(Version15.ElementArrayBuffer, (IntPtr)(indices.Length * sizeof(ushort)), indices, GL.BufferData(BufferTarget.ElementArrayBuffer, (IntPtr)(indices.Length * sizeof(ushort)), indices,
Version15.StaticDraw); BufferUsageHint.StaticDraw);
GL.BindBuffer(Version15.ElementArrayBuffer, 0); GL.BindBuffer(BufferTarget.ElementArrayBuffer, 0);
handle.element_count = indices.Length; handle.element_count = indices.Length;
return handle; return handle;
@ -54,8 +54,8 @@ namespace OpenTK.Fonts
//GL.EnableClientState(EnableCap.TextureCoordArray); //GL.EnableClientState(EnableCap.TextureCoordArray);
GL.EnableClientState(EnableCap.VertexArray); GL.EnableClientState(EnableCap.VertexArray);
GL.BindBuffer(Version15.StaticDraw, vbo.vbo_id); GL.BindBuffer(BufferTarget.ArrayBuffer, vbo.vbo_id);
GL.BindBuffer(Version15.ElementArrayBuffer, vbo.ebo_id); GL.BindBuffer(BufferTarget.ElementArrayBuffer, vbo.ebo_id);
GL.TexCoordPointer(2, TexCoordPointerType.Float, vector2_size, (IntPtr)vector2_size); GL.TexCoordPointer(2, TexCoordPointerType.Float, vector2_size, (IntPtr)vector2_size);
GL.VertexPointer(2, VertexPointerType.Float, vector2_size, IntPtr.Zero); GL.VertexPointer(2, VertexPointerType.Float, vector2_size, IntPtr.Zero);
@ -63,8 +63,8 @@ namespace OpenTK.Fonts
GL.DrawElements(BeginMode.Triangles, vbo.element_count, All.UnsignedShort, IntPtr.Zero); GL.DrawElements(BeginMode.Triangles, vbo.element_count, All.UnsignedShort, IntPtr.Zero);
//GL.DrawArrays(BeginMode.LineLoop, 0, vbo.element_count); //GL.DrawArrays(BeginMode.LineLoop, 0, vbo.element_count);
GL.BindBuffer(Version15.ArrayBuffer, 0); GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
GL.BindBuffer(Version15.ElementArrayBuffer, 0); GL.BindBuffer(BufferTarget.ElementArrayBuffer, 0);
GL.DisableClientState(EnableCap.VertexArray); GL.DisableClientState(EnableCap.VertexArray);
//GL.DisableClientState(EnableCap.TextureCoordArray); //GL.DisableClientState(EnableCap.TextureCoordArray);