Commit: 4f7c738a38b2058fa4d63304a7043f3520df3e1e
Author: Mike Erwin
Date: Mon May 15 12:47:25 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB4f7c738a38b2058fa4d63304a7043f3520df3e1e
Gawain: revert recent VRAM usage metric
Revert 7a18ee62eb4d6c6028d05f1da259fe8695f49a3f and
1ff97bbfff78a0c375fb5256a9d9d37cd3973bbe after discussing with @fclem.
VertexBuffer_size should always report the same buffer size, but without
asking/calling OpenGL.
===================================================================
M intern/gawain/src/vertex_buffer.c
===================================================================
diff --git a/intern/gawain/src/vertex_buffer.c
b/intern/gawain/src/vertex_buffer.c
index 0029e6d5fe9..12ca6ae00b1 100644
--- a/intern/gawain/src/vertex_buffer.c
+++ b/intern/gawain/src/vertex_buffer.c
@@ -54,13 +54,8 @@ void VertexBuffer_init_with_format(VertexBuffer* verts,
const VertexFormat* form
void VertexBuffer_discard(VertexBuffer* verts)
{
if (verts->vbo_id) {
- int size;
- glBindBuffer(GL_ARRAY_BUFFER, verts->vbo_id);
- glGetBufferParameteriv(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, &size);
- vbo_memory_usage -= size;
- glBindBuffer(GL_ARRAY_BUFFER, 0);
-
buffer_id_free(verts->vbo_id);
+ vbo_memory_usage -= VertexBuffer_size(verts);
}
#if KEEP_SINGLE_COPY
else
@@ -165,10 +160,7 @@ static void VertexBuffer_prime(VertexBuffer* verts)
// 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);
- int size;
- glGetBufferParameteriv(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, &size);
-
- vbo_memory_usage += size;
+ vbo_memory_usage += VertexBuffer_size(verts);
#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
