From 0f949d82e81ec2478d12ecca122364001463fca7 Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 14 Nov 2010 13:23:32 +0000 Subject: [PATCH] rename meshes to draws in r_speeds report added drawn vertices count alongside the triangles count git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10598 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_screen.c | 4 ++-- client.h | 5 +++-- gl_backend.c | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cl_screen.c b/cl_screen.c index bc46fa19..70f4db8a 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -796,7 +796,7 @@ void R_TimeReport_EndFrame(void) "%5i leafs%5i portals%6i/%6i particles%6i/%6i decals %3i%% quality\n" "%7i lightmap updates (%7i pixels)\n" "%4i lights%4i clears%4i scissored%7i light%7i shadow%7i dynamic\n" -"rendered%6i meshes%8i triangles bloompixels%8i copied%8i drawn\n" +"%6i draws%8i vertices%8i triangles bloompixels%8i copied%8i drawn\n" "updated%5i indexbuffers%8i bytes%5i vertexbuffers%8i bytes\n" "%s" , loc ? "Location: " : "", loc ? loc->name : "" @@ -806,7 +806,7 @@ void R_TimeReport_EndFrame(void) , r_refdef.stats.world_leafs, r_refdef.stats.world_portals, r_refdef.stats.particles, cl.num_particles, r_refdef.stats.drawndecals, r_refdef.stats.totaldecals, (int)(100 * r_refdef.view.quality) , r_refdef.stats.lightmapupdates, r_refdef.stats.lightmapupdatepixels , r_refdef.stats.lights, r_refdef.stats.lights_clears, r_refdef.stats.lights_scissored, r_refdef.stats.lights_lighttriangles, r_refdef.stats.lights_shadowtriangles, r_refdef.stats.lights_dynamicshadowtriangles -, r_refdef.stats.meshes, r_refdef.stats.meshes_elements / 3, r_refdef.stats.bloom_copypixels, r_refdef.stats.bloom_drawpixels +, r_refdef.stats.draws, r_refdef.stats.draws_vertices, r_refdef.stats.draws_elements / 3, r_refdef.stats.bloom_copypixels, r_refdef.stats.bloom_drawpixels , r_refdef.stats.indexbufferuploadcount, r_refdef.stats.indexbufferuploadsize, r_refdef.stats.vertexbufferuploadcount, r_refdef.stats.vertexbufferuploadsize , r_speeds_timestring); diff --git a/client.h b/client.h index f840b331..3fcec6a2 100644 --- a/client.h +++ b/client.h @@ -1548,8 +1548,9 @@ typedef struct r_refdef_stats_s int particles; int drawndecals; int totaldecals; - int meshes; - int meshes_elements; + int draws; + int draws_vertices; + int draws_elements; int lights; int lights_clears; int lights_scissored; diff --git a/gl_backend.c b/gl_backend.c index 14dc46ee..238b7812 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -2459,8 +2459,9 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri bufferoffset3i = element3i_bufferoffset; bufferobject3s = element3s_indexbuffer ? element3s_indexbuffer->bufferobject : 0; bufferoffset3s = element3s_bufferoffset; - r_refdef.stats.meshes++; - r_refdef.stats.meshes_elements += numelements; + r_refdef.stats.draws++; + r_refdef.stats.draws_vertices += numvertices; + r_refdef.stats.draws_elements += numelements; if (gl_paranoid.integer) { unsigned int i; -- 2.39.2