epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unify framebuffer api naming.

Browse Source
This commit is contained in:
Paul Chote
2015-12-28 11:02:22 +00:00
parent 4372ed650e
commit e63fc00b76
9 changed files with 108 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Platforms.Default/VertexBuffer.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Platforms.Default
public VertexBuffer(int size)
{
OpenGL.glGenBuffers(1, out buffer);
ErrorHandler.CheckGlError();
OpenGL.CheckGLError();
Bind();
var ptr = GCHandle.Alloc(new T[size], GCHandleType.Pinned);
@@ -39,7 +39,7 @@ namespace OpenRA.Platforms.Default
ptr.Free();
}
ErrorHandler.CheckGlError();
OpenGL.CheckGLError();
}
public void SetData(T[] data, int length)
@@ -64,7 +64,7 @@ namespace OpenRA.Platforms.Default
ptr.Free();
}
ErrorHandler.CheckGlError();
OpenGL.CheckGLError();
}
public void SetData(IntPtr data, int start, int length)
@@ -74,18 +74,18 @@ namespace OpenRA.Platforms.Default
new IntPtr(VertexSize * start),
new IntPtr(VertexSize * length),
data);
ErrorHandler.CheckGlError();
OpenGL.CheckGLError();
}
public void Bind()
{
VerifyThreadAffinity();
OpenGL.glBindBuffer(OpenGL.GL_ARRAY_BUFFER, buffer);
ErrorHandler.CheckGlError();
OpenGL.CheckGLError();
OpenGL.glVertexAttribPointer(Shader.VertexPosAttributeIndex, 3, OpenGL.GL_FLOAT, false, VertexSize, IntPtr.Zero);
ErrorHandler.CheckGlError();
OpenGL.CheckGLError();
OpenGL.glVertexAttribPointer(Shader.TexCoordAttributeIndex, 4, OpenGL.GL_FLOAT, false, VertexSize, new IntPtr(12));
ErrorHandler.CheckGlError();
OpenGL.CheckGLError();
}
~VertexBuffer()