kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Gawain: revert recent VRAM usage metric

Browse Source 
Revert 7a18ee62eb4d6c6028d05f1da259fe8695f49a3f and 1ff97bbfff78a0c375fb5256a9d9d37cd3973bbe after discussing with @fclem.

VertexBuffer_size should always report the same buffer size, but without asking/calling OpenGL.
This commit is contained in:
Mike Erwin 2017-05-15 12:47:25 -04:00
parent 77d0aec3d1
commit 4f7c738a38
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intern/gawain/src/vertex_buffer.c
View File

@ -54,13 +54,8 @@ void VertexBuffer_init_with_format(VertexBuffer* verts, const VertexFormat* form
void VertexBuffer_discard(VertexBuffer* verts) void VertexBuffer_discard(VertexBuffer* verts)
{ {
if (verts->vbo_id) { 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); buffer_id_free(verts->vbo_id);
vbo_memory_usage -= VertexBuffer_size(verts);
} }
#if KEEP_SINGLE_COPY #if KEEP_SINGLE_COPY
else else
@ -165,10 +160,7 @@ static void VertexBuffer_prime(VertexBuffer* verts)
// fill with delicious data & send to GPU the first time only // 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, vertex_buffer_size(format, verts->vertex_ct), verts->data, GL_STATIC_DRAW);
int size; vbo_memory_usage += VertexBuffer_size(verts);
glGetBufferParameteriv(GL_ARRAY_BUFFER, GL_BUFFER_SIZE, &size);
vbo_memory_usage += size;
#if KEEP_SINGLE_COPY #if KEEP_SINGLE_COPY
// now that GL has a copy, discard original // now that GL has a copy, discard original