Commit: 87bbeb283778cc00f6f50bb85786aa88cff6aac1
Author: Mike Erwin
Date: Mon May 15 13:07:47 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB87bbeb283778cc00f6f50bb85786aa88cff6aac1
Gawain: further cleanup to VertexBuffer_prime
Get buffer size once, use it to both allocate and track VRAM.
===================================================================
M intern/gawain/src/vertex_buffer.c
===================================================================
diff --git a/intern/gawain/src/vertex_buffer.c
b/intern/gawain/src/vertex_buffer.c
index abde175a344..769a0842a7e 100644
--- a/intern/gawain/src/vertex_buffer.c
+++ b/intern/gawain/src/vertex_buffer.c
@@ -153,14 +153,14 @@ void VertexBuffer_fill_attrib_stride(VertexBuffer* verts,
unsigned a_idx, unsign
static void VertexBuffer_prime(VertexBuffer* verts)
{
- const VertexFormat* format = &verts->format;
+ const unsigned buffer_sz = VertexBuffer_size(verts);
verts->vbo_id = buffer_id_alloc();
glBindBuffer(GL_ARRAY_BUFFER, verts->vbo_id);
// fill with delicious data & send to GPU the first time only
- glBufferData(GL_ARRAY_BUFFER, vertex_buffer_size(format,
verts->vertex_ct), verts->data, GL_STATIC_DRAW);
+ glBufferData(GL_ARRAY_BUFFER, buffer_sz, verts->data, GL_STATIC_DRAW);
- vbo_memory_usage += VertexBuffer_size(verts);
+ vbo_memory_usage += buffer_sz;
#if KEEP_SINGLE_COPY
// now that GL has a copy, discard original
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
