implemented use of GL_ARB_uniform_buffer_object for r_glsl_skeletal

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 126f8284ce06aab2288b9abfbf81c89d98bb1ae1..249ee222ef7a2dcb269cef1ef750e084ca913132 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -785,6 +785,14 @@ const char *r_stat_name[r_stat_count] =
        "vertexbufferuploadsize",
        "framedatacurrent",
        "framedatasize",
+       "bufferdatacurrent_vertex", // R_BUFFERDATA_ types are added to this index
+       "bufferdatacurrent_index16",
+       "bufferdatacurrent_index32",
+       "bufferdatacurrent_uniform",
+       "bufferdatasize_vertex", // R_BUFFERDATA_ types are added to this index
+       "bufferdatasize_index16",
+       "bufferdatasize_index32",
+       "bufferdatasize_uniform",
        "animcache_vertexmesh_count",
        "animcache_vertexmesh_vertices",
        "animcache_vertexmesh_maxvertices",
@@ -1074,7 +1082,7 @@ static void R_TimeReport_EndFrame(void)
                        cls.r_speeds_graph_current = 0;
                        if (cls.r_speeds_graph_data)
                                Mem_Free(cls.r_speeds_graph_data);
-                       cls.r_speeds_graph_data = Mem_Alloc(cls.permanentmempool, cls.r_speeds_graph_length * sizeof(r_refdef.stats));
+                       cls.r_speeds_graph_data = (int *)Mem_Alloc(cls.permanentmempool, cls.r_speeds_graph_length * sizeof(r_refdef.stats));
                        // initialize the graph to have the current values throughout history
                        graph_data = cls.r_speeds_graph_data;
                        graph_length = cls.r_speeds_graph_length;