[Bf-blender-cvs] [30d325c9e61] blender2.8: Gawain: cleanup VRAM usage metric

[Mike Erwin]

Commit: 30d325c9e61fb349e1b2bc6ea2f65b282d991c22
Author: Mike Erwin
Date:   Mon May 15 13:05:32 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB30d325c9e61fb349e1b2bc6ea2f65b282d991c22

Gawain: cleanup VRAM usage metric

same functionality

===================================================================

M       intern/gawain/gawain/vertex_buffer.h
M       intern/gawain/gawain/vertex_format.h
M       intern/gawain/src/vertex_buffer.c

===================================================================

diff --git a/intern/gawain/gawain/vertex_buffer.h 
b/intern/gawain/gawain/vertex_buffer.h
index e2e9c2d0ba8..1e3819b74e5 100644
--- a/intern/gawain/gawain/vertex_buffer.h
+++ b/intern/gawain/gawain/vertex_buffer.h
@@ -64,7 +64,12 @@ void VertexBuffer_fill_attrib_stride(VertexBuffer*, unsigned 
a_idx, unsigned str
 void VertexBuffer_use(VertexBuffer*);
 
 
-/* Macros */
+// Metrics
+
+unsigned VertexBuffer_get_memory_usage(void);
+
+
+// Macros
 
 #define VERTEXBUFFER_DISCARD_SAFE(verts) do { \
        if (verts != NULL) { \
diff --git a/intern/gawain/gawain/vertex_format.h 
b/intern/gawain/gawain/vertex_format.h
index f5749a366cf..8e11158f332 100644
--- a/intern/gawain/gawain/vertex_format.h
+++ b/intern/gawain/gawain/vertex_format.h
@@ -75,10 +75,6 @@ void VertexFormat_copy(VertexFormat* dest, const 
VertexFormat* src);
 unsigned VertexFormat_add_attrib(VertexFormat*, const char* name, 
VertexCompType, unsigned comp_ct, VertexFetchMode);
 void VertexFormat_add_alias(VertexFormat*, const char* alias);
 
-// Memory Management
-
-unsigned VertexBuffer_get_memory_usage(void);
-
 // format conversion
 
 #if USE_10_10_10
diff --git a/intern/gawain/src/vertex_buffer.c 
b/intern/gawain/src/vertex_buffer.c
index 12ca6ae00b1..abde175a344 100644
--- a/intern/gawain/src/vertex_buffer.c
+++ b/intern/gawain/src/vertex_buffer.c
@@ -179,5 +179,5 @@ void VertexBuffer_use(VertexBuffer* verts)
 
 unsigned VertexBuffer_get_memory_usage(void)
        {
-               return vbo_memory_usage;
-       }
\ No newline at end of file
+       return vbo_memory_usage;
+       }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs