From bab9963b00953d60bdd6fabe265d5daa45a27661 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 17 Apr 2013 23:09:55 -0400 Subject: New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects. --- Source/Core/VideoCommon/Src/Statistics.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'Source/Core/VideoCommon/Src/Statistics.cpp') diff --git a/Source/Core/VideoCommon/Src/Statistics.cpp b/Source/Core/VideoCommon/Src/Statistics.cpp index 5f3240f44e..14fb01a384 100644 --- a/Source/Core/VideoCommon/Src/Statistics.cpp +++ b/Source/Core/VideoCommon/Src/Statistics.cpp @@ -1,19 +1,6 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include -- cgit v1.2.3 From d244bca1f5f210e03839d0e0a485fc5511ede2d6 Mon Sep 17 00:00:00 2001 From: lioncash Date: Fri, 19 Apr 2013 09:21:45 -0400 Subject: Fix a bunch of random typos in comments and logging. Also update the comment headers for two functions in GCMemcard.cpp. --- Source/Core/VideoCommon/Src/Statistics.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/Core/VideoCommon/Src/Statistics.cpp') diff --git a/Source/Core/VideoCommon/Src/Statistics.cpp b/Source/Core/VideoCommon/Src/Statistics.cpp index 14fb01a384..9b7c981b17 100644 --- a/Source/Core/VideoCommon/Src/Statistics.cpp +++ b/Source/Core/VideoCommon/Src/Statistics.cpp @@ -33,8 +33,8 @@ void Statistics::SwapDL() char *Statistics::ToString(char *ptr) { char *p = ptr; - ptr+=sprintf(ptr,"textures created: %i\n",stats.numTexturesCreated); - ptr+=sprintf(ptr,"textures alive: %i\n",stats.numTexturesAlive); + 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); @@ -43,12 +43,12 @@ char *Statistics::ToString(char *ptr) 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,"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); -- cgit v1.2.3 From 8da425b008b46ef90d649e55c6c0d4a0bc2b556b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 24 Apr 2013 09:21:54 -0400 Subject: Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck). --- Source/Core/VideoCommon/Src/Statistics.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/Src/Statistics.cpp') diff --git a/Source/Core/VideoCommon/Src/Statistics.cpp b/Source/Core/VideoCommon/Src/Statistics.cpp index 9b7c981b17..3dcd281b7f 100644 --- a/Source/Core/VideoCommon/Src/Statistics.cpp +++ b/Source/Core/VideoCommon/Src/Statistics.cpp @@ -72,7 +72,8 @@ char *Statistics::ToString(char *ptr) } // Is this really needed? -char *Statistics::ToStringProj(char *ptr) { +char *Statistics::ToStringProj(char *ptr) +{ 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); -- cgit v1.2.3