Skip to content

Commit

Permalink
VertexArray API for GraphicsDevice
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelsakharov
michaelsakharov committed Apr 7, 2024
1 parent d68cd74 commit 3db2a54
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 57 deletions.
2 changes: 1 addition & 1 deletion Prowl.Runtime/Graphics.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public static void DrawMeshNowDirect(Mesh mesh)
{
Device.BindVertexArray(mesh.VertexArrayObject);
Device.DrawElements(PrimitiveType.Triangles, (uint)mesh.IndexCount, mesh.IndexFormat == IndexFormat.UInt16 ? DrawElementsType.UnsignedShort : DrawElementsType.UnsignedInt, null);
Device.BindVertexArray(0);
Device.BindVertexArray(null);
}
}

Expand Down
14 changes: 8 additions & 6 deletions Prowl.Runtime/Rendering/GraphicsDevice.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ public enum WindingOrder { CW, CCW }
public RasterizerState() { }
}

public abstract class GraphicsVertexArray : IDisposable
{
public abstract bool IsDisposed { get; protected set; }
public abstract void Dispose();
}

public abstract class GraphicsDevice
{
public abstract void Initialize(bool debug);
Expand All @@ -62,12 +68,8 @@ public abstract class GraphicsDevice

#region Vertex Arrays

public abstract uint GenVertexArray();
public abstract void BindVertexArray(uint vertexArrayObject);
public abstract void DeleteVertexArray(uint vertexArrayObject);
public abstract void EnableVertexAttribArray(uint index);
public abstract unsafe void VertexAttribPointer(uint index, byte count, GLEnum type, bool normalized, uint size, void* offset);
public abstract unsafe void VertexAttribIPointer(uint index, byte count, GLEnum type, uint size, void* offset);
public abstract GraphicsVertexArray CreateVertexArray(VertexFormat format, GraphicsBuffer vertices, GraphicsBuffer? indices);
public abstract void BindVertexArray(GraphicsVertexArray? vertexArrayObject);

#endregion

Expand Down
68 changes: 61 additions & 7 deletions Prowl.Runtime/Rendering/OpenGL/GLDevice.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,57 @@
using Silk.NET.Core.Native;
using Silk.NET.OpenGL;
using System;
using static VertexFormat;
using System.Drawing;

namespace Prowl.Runtime.Rendering.OpenGL
{
public sealed unsafe class GLVertexArray : GraphicsVertexArray
{
public uint Handle { get; private set; }

public GLVertexArray(VertexFormat format, GraphicsBuffer vertices, GraphicsBuffer? indices)
{

Handle = GLDevice.GL.GenVertexArray();
GLDevice.GL.BindVertexArray(Handle);

BindFormat(format);

GLDevice.GL.BindBuffer(BufferTargetARB.ArrayBuffer, (vertices as GLBuffer).Handle);
if (indices != null)
GLDevice.GL.BindBuffer(BufferTargetARB.ElementArrayBuffer, (indices as GLBuffer).Handle);
}

void BindFormat(VertexFormat format)
{
for (var i = 0; i < format.Elements.Length; i++)
{
var element = format.Elements[i];
var index = element.Semantic;
GLDevice.GL.EnableVertexAttribArray(index);
int offset = (int)element.Offset;
unsafe
{
if (element.Type == VertexType.Float)
GLDevice.GL.VertexAttribPointer(index, element.Count, (GLEnum)element.Type, element.Normalized, (uint)format.Size, (void*)offset);
else
GLDevice.GL.VertexAttribIPointer(index, element.Count, (GLEnum)element.Type, (uint)format.Size, (void*)offset);
}
}
}

public override bool IsDisposed { get; protected set; }

public override void Dispose()
{
if (IsDisposed)
return;

GLDevice.GL.DeleteVertexArray(Handle);
IsDisposed = true;
}
}

public sealed unsafe class GLDevice : GraphicsDevice
{
Expand Down Expand Up @@ -190,13 +238,19 @@ public override void BindBuffer(GraphicsBuffer buffer)

#region Vertex Arrays

public override uint GenVertexArray() => GL.GenVertexArray();
public override void BindVertexArray(uint vertexArrayObject) => GL.BindVertexArray(vertexArrayObject);
public override void DeleteVertexArray(uint vertexArrayObject) => GL.DeleteVertexArray(vertexArrayObject);
public override void EnableVertexAttribArray(uint index) => GL.EnableVertexAttribArray(index);
public override unsafe void VertexAttribIPointer(uint index, byte count, GLEnum type, uint size, void* offset) => GL.VertexAttribIPointer(index, count, type, size, offset);

public override unsafe void VertexAttribPointer(uint index, byte count, GLEnum type, bool normalized, uint size, void* offset) => GL.VertexAttribPointer(index, count, type, normalized, size, offset);
public override GraphicsVertexArray CreateVertexArray(VertexFormat format, GraphicsBuffer vertices, GraphicsBuffer? indices)
{
return new GLVertexArray(format, vertices, indices);
}
public override void BindVertexArray(GraphicsVertexArray? vertexArrayObject)
{
GL.BindVertexArray((vertexArrayObject as GLVertexArray)?.Handle ?? 0);
//if (vertexArrayObject == null)
//{
// GLDevice.GL.BindBuffer(BufferTargetARB.ElementArrayBuffer, 0);
// GLDevice.GL.BindBuffer(BufferTargetARB.ArrayBuffer, 0);
//}
}


#endregion
Expand Down
49 changes: 12 additions & 37 deletions Prowl.Runtime/Resources/Mesh.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public System.Numerics.Vector4[] BoneWeights {
public int VertexCount => vertices?.Length ?? 0;
public int IndexCount => indices?.Length ?? 0;

public uint VertexArrayObject => vertexArrayObject;
public GraphicsVertexArray? VertexArrayObject => vertexArrayObject;
public GraphicsBuffer VertexBuffer => vertexBuffer;
public GraphicsBuffer IndexBuffer => indexBuffer;

Expand Down Expand Up @@ -154,7 +154,7 @@ public System.Numerics.Vector4[] BoneWeights {
IndexFormat indexFormat = IndexFormat.UInt16;
PrimitiveType meshTopology = PrimitiveType.TriangleStrip;

uint vertexArrayObject;
GraphicsVertexArray? vertexArrayObject;
GraphicsBuffer vertexBuffer;
GraphicsBuffer indexBuffer;

Expand All @@ -180,7 +180,7 @@ public void Clear()

public void Upload()
{
if (changed == false && vertexArrayObject != 0)
if (changed == false && vertexArrayObject != null)
return;

changed = false;
Expand Down Expand Up @@ -227,12 +227,7 @@ public void Upload()
if (vertexBlob == null)
return;


vertexArrayObject = Graphics.Device.GenVertexArray();
Graphics.Device.BindVertexArray(vertexArrayObject);

vertexBuffer = Graphics.Device.CreateBuffer(BufferType.VertexBuffer, vertexBlob, false);
layout.Bind();

if (indexFormat == IndexFormat.UInt16)
{
Expand All @@ -250,11 +245,11 @@ public void Upload()
indexBuffer = Graphics.Device.CreateBuffer(BufferType.ElementsBuffer, indices, false);
}

vertexArrayObject = Graphics.Device.CreateVertexArray(layout, vertexBuffer, indexBuffer);

Debug.Log($"VAO: [ID {vertexArrayObject}] Mesh uploaded successfully to VRAM (GPU)");

Graphics.Device.BindVertexArray(0);
GLDevice.GL.BindBuffer(BufferTargetARB.ElementArrayBuffer, 0);
GLDevice.GL.BindBuffer(BufferTargetARB.ArrayBuffer, 0);
Graphics.Device.BindVertexArray(null);
}

public void RecalculateBounds()
Expand Down Expand Up @@ -432,14 +427,12 @@ public static Mesh CreateSphere(float radius, int rings, int slices)

private void DeleteGPUBuffers()
{
if (vertexArrayObject != 0)
Graphics.Device.DeleteVertexArray(vertexArrayObject);
//vertexBuffer?.Dispose();
//vertexBuffer = null;
//indexBuffer?.Dispose();
//indexBuffer = null;

vertexArrayObject = 0;
vertexArrayObject?.Dispose();
vertexArrayObject = null;
vertexBuffer?.Dispose();
vertexBuffer = null;
indexBuffer?.Dispose();
indexBuffer = null;
}

private T ReadVertexData<T>(T value)
Expand Down Expand Up @@ -931,22 +924,4 @@ public Element(uint semantic, VertexType type, byte count, short divisor = 0, bo
public enum VertexSemantic { Position, TexCoord0, TexCoord1, Normal, Color, Tangent, BoneIndex, BoneWeight }

public enum VertexType { Byte = 5120, UnsignedByte = 5121, Short = 5122, Int = 5124, Float = 5126, }

public void Bind()
{
for (var i = 0; i < Elements.Length; i++)
{
var element = Elements[i];
var index = element.Semantic;
Graphics.Device.EnableVertexAttribArray(index);
int offset = (int)element.Offset;
unsafe
{
if (element.Type == VertexType.Float)
Graphics.Device.VertexAttribPointer(index, element.Count, (GLEnum)element.Type, element.Normalized, (uint)Size, (void*)offset);
else
Graphics.Device.VertexAttribIPointer(index, element.Count, (GLEnum)element.Type, (uint)Size, (void*)offset);
}
}
}
}
12 changes: 6 additions & 6 deletions Prowl.Runtime/Utils/PrimitiveBatch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ private struct Vertex
public float r, g, b, a;
}

private uint vao;
private GraphicsVertexArray? vao;
private GraphicsBuffer vbo;
private List<Vertex> vertices = new List<Vertex>(50);
private Mesh mesh;
Expand All @@ -27,14 +27,14 @@ public PrimitiveBatch(PrimitiveType primitiveType)
{
this.primitiveType = primitiveType;

vao = Graphics.Device.GenVertexArray();
Graphics.Device.BindVertexArray(vao);
vbo = Graphics.Device.CreateBuffer(BufferType.VertexBuffer, new byte[0], true);

new VertexFormat([
var format = new VertexFormat([
new VertexFormat.Element((uint)0, VertexFormat.VertexType.Float, 3),
new VertexFormat.Element((uint)1, VertexFormat.VertexType.Float, 4)
]).Bind();
]);

vao = Graphics.Device.CreateVertexArray(format, vbo, null);

IsUploaded = false;
}
Expand Down Expand Up @@ -66,7 +66,7 @@ public void Upload()

public void Draw()
{
if (vertices.Count == 0 || vao <= 0) return;
if (vertices.Count == 0 || vao == null) return;

Graphics.Device.BindVertexArray(vao);
Graphics.Device.DrawArrays(primitiveType, 0, (uint)vertices.Count);
Expand Down

0 comments on commit 3db2a54

Please sign in to comment.