jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added VAOs to vertex buffers (might need some future tweaking to check whether buffers are already assigned to specific attributes)

Browse Source
This commit is contained in:
jp9000 2013-11-15 06:34:05 -07:00
parent 041f48b566
commit 72a64b3d41
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libobs-opengl/gl-subsystem.h
View File

@ -344,6 +344,7 @@ struct gs_shader {
extern void shader_update_textures(struct gs_shader *shader);
struct gs_vertex_buffer {
GLuint vao;
GLuint vertex_buffer;
GLuint normal_buffer;
GLuint tangent_buffer;

13
libobs-opengl/gl-vertexbuffer.c
View File

@ -70,6 +70,9 @@ static bool create_buffers(struct gs_vertex_buffer *vb)
vb->data = NULL;
}
if (!gl_gen_vertex_arrays(1, &vb->vao))
return false;
return true;
}
@ -108,6 +111,9 @@ void vertexbuffer_destroy(vertbuffer_t vb)
gl_delete_buffers((GLsizei)vb->uv_buffers.num,
vb->uv_buffers.array);
if (vb->vao)
gl_delete_vertex_arrays(1, &vb->vao);
da_free(vb->uv_sizes);
da_free(vb->uv_buffers);
vbdata_destroy(vb->data);
@ -225,6 +231,9 @@ static bool load_vb_buffer(struct gs_shader *shader,
if (!gl_success("glEnableVertexAttribArray"))
success = false;
if (!gl_bind_buffer(GL_ARRAY_BUFFER, 0))
success = false;
return success;
}
@ -232,6 +241,10 @@ static inline bool load_vb_buffers(struct gs_shader *shader,
struct gs_vertex_buffer *vb)
{
size_t i;
if (!gl_bind_vertex_array(vb->vao))
return false;
for (i = 0; i < shader->attribs.num; i++) {
struct shader_attrib *attrib = shader->attribs.array+i;
if (!load_vb_buffer(shader, attrib, vb))