blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Gawain: fix VAO and VBO binds 

Immediate mode no longer leaves its internals bound after use. Part of
transition from a simple prototype app to non-simple Blender, which has
lots of other parts using OpenGL.
This commit is contained in:
Mike Erwin 2016-08-06 21:49:30 -04:00
parent a55c5dbcc4
commit 6b21d22c60
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/gpu/intern/gpu_immediate.c
View File

@ -201,7 +201,8 @@ void immInit()
imm.primitive = GL_NONE;
// glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindVertexArray(0);
initialized = true;
}
@ -257,7 +258,7 @@ void immBegin(GLenum primitive, unsigned vertex_ct)
assert(bytes_needed <= IMM_BUFFER_SIZE);
#endif
// glBindBuffer(GL_ARRAY_BUFFER, imm.vbo_id);
glBindBuffer(GL_ARRAY_BUFFER, imm.vbo_id);
// does the current buffer have enough room?
const unsigned available_bytes = IMM_BUFFER_SIZE - imm.buffer_offset;
@ -296,7 +297,7 @@ void immEnd()
glUnmapBuffer(GL_ARRAY_BUFFER);
// set up VAO -- can be done during Begin or End really
// glBindVertexArray(imm.vao_id);
glBindVertexArray(imm.vao_id);
const unsigned stride = immVertexFormat.stride;
@ -334,7 +335,8 @@ void immEnd()
glDrawArrays(imm.primitive, 0, imm.vertex_ct);
// glBindVertexArray(0);
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindVertexArray(0);
// prep for next immBegin
imm.buffer_offset += imm.buffer_bytes_mapped;