Merge pull request #416 from lioncash/video-stats

Clean up string managing in regards to video statistics.

1 files changed, 58 insertions, 55 deletions

diff --git a/Source/Core/VideoCommon/Statistics.cpp b/Source/Core/VideoCommon/Statistics.cpp
index d1d6312e41..303972fc90 100644
--- a/Source/Core/VideoCommon/Statistics.cpp
+++ b/Source/Core/VideoCommon/Statistics.cpp
@@ -2,9 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <string.h>
+#include <string>
 #include <utility>
 
+#include "Common/StringUtil.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/VertexLoaderManager.h"
 
@@ -23,70 +24,72 @@ void Statistics::SwapDL()
 	std::swap(stats.thisFrame.numBPLoadsInDL, stats.thisFrame.numBPLoads);
 }
 
-char *Statistics::ToString(char *ptr)
+std::string Statistics::ToString()
 {
-	char *p = ptr;
-	ptr+=sprintf(ptr,"Textures created: %i\n",stats.numTexturesCreated);
-	ptr+=sprintf(ptr,"Textures alive: %i\n",stats.numTexturesAlive);
-	ptr+=sprintf(ptr,"pshaders created: %i\n",stats.numPixelShadersCreated);
-	ptr+=sprintf(ptr,"pshaders alive: %i\n",stats.numPixelShadersAlive);
-	ptr+=sprintf(ptr,"pshaders (unique, delete cache first): %i\n",stats.numUniquePixelShaders);
-	ptr+=sprintf(ptr,"vshaders created: %i\n",stats.numVertexShadersCreated);
-	ptr+=sprintf(ptr,"vshaders alive: %i\n",stats.numVertexShadersAlive);
-	ptr+=sprintf(ptr,"dlists called:    %i\n",stats.numDListsCalled);
-	ptr+=sprintf(ptr,"dlists called(f): %i\n",stats.thisFrame.numDListsCalled);
-	ptr+=sprintf(ptr,"dlists alive:     %i\n",stats.numDListsAlive);
-	ptr+=sprintf(ptr,"Primitive joins: %i\n",stats.thisFrame.numPrimitiveJoins);
-	ptr+=sprintf(ptr,"Draw calls:       %i\n",stats.thisFrame.numDrawCalls);
-	ptr+=sprintf(ptr,"Indexed draw calls: %i\n",stats.thisFrame.numIndexedDrawCalls);
-	ptr+=sprintf(ptr,"Buffer splits:    %i\n",stats.thisFrame.numBufferSplits);
-	ptr+=sprintf(ptr,"Primitives: %i\n",stats.thisFrame.numPrims);
-	ptr+=sprintf(ptr,"Primitives (DL): %i\n",stats.thisFrame.numDLPrims);
-	ptr+=sprintf(ptr,"XF loads: %i\n",stats.thisFrame.numXFLoads);
-	ptr+=sprintf(ptr,"XF loads (DL): %i\n",stats.thisFrame.numXFLoadsInDL);
-	ptr+=sprintf(ptr,"CP loads: %i\n",stats.thisFrame.numCPLoads);
-	ptr+=sprintf(ptr,"CP loads (DL): %i\n",stats.thisFrame.numCPLoadsInDL);
-	ptr+=sprintf(ptr,"BP loads: %i\n",stats.thisFrame.numBPLoads);
-	ptr+=sprintf(ptr,"BP loads (DL): %i\n",stats.thisFrame.numBPLoadsInDL);
-	ptr+=sprintf(ptr,"Vertex streamed: %i kB\n",stats.thisFrame.bytesVertexStreamed/1024);
-	ptr+=sprintf(ptr,"Index streamed: %i kB\n",stats.thisFrame.bytesIndexStreamed/1024);
-	ptr+=sprintf(ptr,"Uniform streamed: %i kB\n",stats.thisFrame.bytesUniformStreamed/1024);
-	ptr+=sprintf(ptr,"Vertex Loaders: %i\n",stats.numVertexLoaders);
+	std::string str;
+	str += StringFromFormat("Textures created: %i\n",stats.numTexturesCreated);
+	str += StringFromFormat("Textures alive: %i\n", stats.numTexturesAlive);
+	str += StringFromFormat("pshaders created: %i\n", stats.numPixelShadersCreated);
+	str += StringFromFormat("pshaders alive: %i\n",stats.numPixelShadersAlive);
+	str += StringFromFormat("pshaders (unique, delete cache first): %i\n",stats.numUniquePixelShaders);
+	str += StringFromFormat("vshaders created: %i\n",stats.numVertexShadersCreated);
+	str += StringFromFormat("vshaders alive: %i\n",stats.numVertexShadersAlive);
+	str += StringFromFormat("dlists called:    %i\n",stats.numDListsCalled);
+	str += StringFromFormat("dlists called(f): %i\n",stats.thisFrame.numDListsCalled);
+	str += StringFromFormat("dlists alive:     %i\n",stats.numDListsAlive);
+	str += StringFromFormat("Primitive joins: %i\n",stats.thisFrame.numPrimitiveJoins);
+	str += StringFromFormat("Draw calls:       %i\n",stats.thisFrame.numDrawCalls);
+	str += StringFromFormat("Indexed draw calls: %i\n",stats.thisFrame.numIndexedDrawCalls);
+	str += StringFromFormat("Buffer splits:    %i\n",stats.thisFrame.numBufferSplits);
+	str += StringFromFormat("Primitives: %i\n",stats.thisFrame.numPrims);
+	str += StringFromFormat("Primitives (DL): %i\n",stats.thisFrame.numDLPrims);
+	str += StringFromFormat("XF loads: %i\n",stats.thisFrame.numXFLoads);
+	str += StringFromFormat("XF loads (DL): %i\n",stats.thisFrame.numXFLoadsInDL);
+	str += StringFromFormat("CP loads: %i\n",stats.thisFrame.numCPLoads);
+	str += StringFromFormat("CP loads (DL): %i\n",stats.thisFrame.numCPLoadsInDL);
+	str += StringFromFormat("BP loads: %i\n",stats.thisFrame.numBPLoads);
+	str += StringFromFormat("BP loads (DL): %i\n",stats.thisFrame.numBPLoadsInDL);
+	str += StringFromFormat("Vertex streamed: %i kB\n",stats.thisFrame.bytesVertexStreamed/1024);
+	str += StringFromFormat("Index streamed: %i kB\n",stats.thisFrame.bytesIndexStreamed/1024);
+	str += StringFromFormat("Uniform streamed: %i kB\n",stats.thisFrame.bytesUniformStreamed/1024);
+	str += StringFromFormat("Vertex Loaders: %i\n",stats.numVertexLoaders);
 
-	std::string text1;
-	VertexLoaderManager::AppendListToString(&text1);
+	std::string vertex_list;
+	VertexLoaderManager::AppendListToString(&vertex_list);
 
 	// TODO : at some point text1 just becomes too huge and overflows, we can't even read the added stuff
 	// since it gets added at the far bottom of the screen anyway (actually outside the rendering window)
 	// we should really reset the list instead of using substr
-	if (text1.size() + ptr - p > 8170)
-		text1 = text1.substr(0, 8170 - (ptr - p));
+	if (vertex_list.size() + str.size() > 8170)
+		vertex_list = vertex_list.substr(0, 8170 - str.size());
 
-	ptr+=sprintf(ptr,"%s",text1.c_str());
+	str += vertex_list;
 
-	return ptr;
+	return str;
 }
 
 // Is this really needed?
-char *Statistics::ToStringProj(char *ptr)
+std::string Statistics::ToStringProj()
 {
-	char *p = ptr;
-	p+=sprintf(p,"Projection #: X for Raw 6=0 (X for Raw 6!=0)\n\n");
-	p+=sprintf(p,"Projection 0: %f (%f) Raw 0: %f\n", stats.gproj_0, stats.g2proj_0, stats.proj_0);
-	p+=sprintf(p,"Projection 1: %f (%f)\n", stats.gproj_1, stats.g2proj_1);
-	p+=sprintf(p,"Projection 2: %f (%f) Raw 1: %f\n", stats.gproj_2, stats.g2proj_2, stats.proj_1);
-	p+=sprintf(p,"Projection 3: %f (%f)\n\n", stats.gproj_3, stats.g2proj_3);
-	p+=sprintf(p,"Projection 4: %f (%f)\n", stats.gproj_4, stats.g2proj_4);
-	p+=sprintf(p,"Projection 5: %f (%f) Raw 2: %f\n", stats.gproj_5, stats.g2proj_5, stats.proj_2);
-	p+=sprintf(p,"Projection 6: %f (%f) Raw 3: %f\n", stats.gproj_6, stats.g2proj_6, stats.proj_3);
-	p+=sprintf(p,"Projection 7: %f (%f)\n\n", stats.gproj_7, stats.g2proj_7);
-	p+=sprintf(p,"Projection 8: %f (%f)\n", stats.gproj_8, stats.g2proj_8);
-	p+=sprintf(p,"Projection 9: %f (%f)\n", stats.gproj_9, stats.g2proj_9);
-	p+=sprintf(p,"Projection 10: %f (%f) Raw 4: %f\n\n", stats.gproj_10, stats.g2proj_10, stats.proj_4);
-	p+=sprintf(p,"Projection 11: %f (%f) Raw 5: %f\n\n", stats.gproj_11, stats.g2proj_11, stats.proj_5);
-	p+=sprintf(p,"Projection 12: %f (%f)\n", stats.gproj_12, stats.g2proj_12);
-	p+=sprintf(p,"Projection 13: %f (%f)\n", stats.gproj_13, stats.g2proj_13);
-	p+=sprintf(p,"Projection 14: %f (%f)\n", stats.gproj_14, stats.g2proj_14);
-	p+=sprintf(p,"Projection 15: %f (%f)\n", stats.gproj_15, stats.g2proj_15);
-	return p;
+	std::string projections;
+
+	projections += "Projection #: X for Raw 6=0 (X for Raw 6!=0)\n\n";
+	projections += StringFromFormat("Projection 0: %f (%f) Raw 0: %f\n", stats.gproj_0, stats.g2proj_0, stats.proj_0);
+	projections += StringFromFormat("Projection 1: %f (%f)\n", stats.gproj_1, stats.g2proj_1);
+	projections += StringFromFormat("Projection 2: %f (%f) Raw 1: %f\n", stats.gproj_2, stats.g2proj_2, stats.proj_1);
+	projections += StringFromFormat("Projection 3: %f (%f)\n\n", stats.gproj_3, stats.g2proj_3);
+	projections += StringFromFormat("Projection 4: %f (%f)\n", stats.gproj_4, stats.g2proj_4);
+	projections += StringFromFormat("Projection 5: %f (%f) Raw 2: %f\n", stats.gproj_5, stats.g2proj_5, stats.proj_2);
+	projections += StringFromFormat("Projection 6: %f (%f) Raw 3: %f\n", stats.gproj_6, stats.g2proj_6, stats.proj_3);
+	projections += StringFromFormat("Projection 7: %f (%f)\n\n", stats.gproj_7, stats.g2proj_7);
+	projections += StringFromFormat("Projection 8: %f (%f)\n", stats.gproj_8, stats.g2proj_8);
+	projections += StringFromFormat("Projection 9: %f (%f)\n", stats.gproj_9, stats.g2proj_9);
+	projections += StringFromFormat("Projection 10: %f (%f) Raw 4: %f\n\n", stats.gproj_10, stats.g2proj_10, stats.proj_4);
+	projections += StringFromFormat("Projection 11: %f (%f) Raw 5: %f\n\n", stats.gproj_11, stats.g2proj_11, stats.proj_5);
+	projections += StringFromFormat("Projection 12: %f (%f)\n", stats.gproj_12, stats.g2proj_12);
+	projections += StringFromFormat("Projection 13: %f (%f)\n", stats.gproj_13, stats.g2proj_13);
+	projections += StringFromFormat("Projection 14: %f (%f)\n", stats.gproj_14, stats.g2proj_14);
+	projections += StringFromFormat("Projection 15: %f (%f)\n", stats.gproj_15, stats.g2proj_15);
+
+	return projections;
 }