diff options
| -rw-r--r-- | bench/TextBench.cpp | 4 | ||||
| -rw-r--r-- | bench/benchmain.cpp | 5 | ||||
| -rw-r--r-- | xcode/core/core.xcodeproj/project.pbxproj | 15 |
3 files changed, 23 insertions, 1 deletions
diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp index 5caaddbe4b..752c7ebfcd 100644 --- a/bench/TextBench.cpp +++ b/bench/TextBench.cpp @@ -103,6 +103,8 @@ private: #define BIG 48 static SkBenchmark* Fact0(void* p) { return new TextBench(p, STR, SMALL, false, false); } +static BenchRegistry gReg0(Fact0); + static SkBenchmark* Fact1(void* p) { return new TextBench(p, STR, SMALL, false, true); } static SkBenchmark* Fact2(void* p) { return new TextBench(p, STR, SMALL, true, false); } static SkBenchmark* Fact3(void* p) { return new TextBench(p, STR, SMALL, true, true); } @@ -111,7 +113,6 @@ static SkBenchmark* Fact5(void* p) { return new TextBench(p, STR, BIG, false, tr static SkBenchmark* Fact6(void* p) { return new TextBench(p, STR, BIG, true, false); } static SkBenchmark* Fact7(void* p) { return new TextBench(p, STR, BIG, true, true); } -static BenchRegistry gReg0(Fact0); static BenchRegistry gReg1(Fact1); static BenchRegistry gReg2(Fact2); static BenchRegistry gReg3(Fact3); @@ -119,3 +120,4 @@ static BenchRegistry gReg4(Fact4); static BenchRegistry gReg5(Fact5); static BenchRegistry gReg6(Fact6); static BenchRegistry gReg7(Fact7); + diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp index 2f8b006fda..3b6dfdf3f8 100644 --- a/bench/benchmain.cpp +++ b/bench/benchmain.cpp @@ -368,6 +368,11 @@ int main (int argc, char * const argv[]) { performRotate(&canvas, dim.fX, dim.fY); } + if (repeatDraw > 1) { + SkAutoCanvasRestore acr(&canvas, true); + bench->draw(&canvas); + } + SkMSec now = SkTime::GetMSecs(); for (int i = 0; i < repeatDraw; i++) { SkCanvas* c = &canvas; diff --git a/xcode/core/core.xcodeproj/project.pbxproj b/xcode/core/core.xcodeproj/project.pbxproj index 0b510c73a0..fb0b6e191d 100644 --- a/xcode/core/core.xcodeproj/project.pbxproj +++ b/xcode/core/core.xcodeproj/project.pbxproj @@ -131,6 +131,8 @@ 00F043FC10B445F50049C54C /* SkEdgeBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00F043F910B445F50049C54C /* SkEdgeBuilder.cpp */; }; 00F043FD10B445F50049C54C /* SkEdgeClipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00F043FA10B445F50049C54C /* SkEdgeClipper.cpp */; }; 00F043FE10B445F50049C54C /* SkLineClipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00F043FB10B445F50049C54C /* SkLineClipper.cpp */; }; + 277670F512B840CA006811C2 /* SkRegion_rects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 277670F312B840CA006811C2 /* SkRegion_rects.cpp */; }; + 277670F612B840CA006811C2 /* SkScalar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 277670F412B840CA006811C2 /* SkScalar.cpp */; }; 27CE2BE912393D1D00CF4BB7 /* SkMallocPixelRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27CE2BE812393D1D00CF4BB7 /* SkMallocPixelRef.cpp */; }; /* End PBXBuildFile section */ @@ -259,6 +261,8 @@ 00F043F910B445F50049C54C /* SkEdgeBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkEdgeBuilder.cpp; path = ../../src/core/SkEdgeBuilder.cpp; sourceTree = SOURCE_ROOT; }; 00F043FA10B445F50049C54C /* SkEdgeClipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkEdgeClipper.cpp; path = ../../src/core/SkEdgeClipper.cpp; sourceTree = SOURCE_ROOT; }; 00F043FB10B445F50049C54C /* SkLineClipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkLineClipper.cpp; path = ../../src/core/SkLineClipper.cpp; sourceTree = SOURCE_ROOT; }; + 277670F312B840CA006811C2 /* SkRegion_rects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkRegion_rects.cpp; path = ../../src/core/SkRegion_rects.cpp; sourceTree = SOURCE_ROOT; }; + 277670F412B840CA006811C2 /* SkScalar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkScalar.cpp; path = ../../src/core/SkScalar.cpp; sourceTree = SOURCE_ROOT; }; 27CE2BE812393D1D00CF4BB7 /* SkMallocPixelRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkMallocPixelRef.cpp; path = ../../src/core/SkMallocPixelRef.cpp; sourceTree = SOURCE_ROOT; }; D2AAC046055464E500DB518D /* libcore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcore.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -304,6 +308,8 @@ 08FB7795FE84155DC02AAC07 /* src */ = { isa = PBXGroup; children = ( + 277670F312B840CA006811C2 /* SkRegion_rects.cpp */, + 277670F412B840CA006811C2 /* SkScalar.cpp */, 27CE2BE812393D1D00CF4BB7 /* SkMallocPixelRef.cpp */, 00F043F910B445F50049C54C /* SkEdgeBuilder.cpp */, 00F043FA10B445F50049C54C /* SkEdgeClipper.cpp */, @@ -515,7 +521,14 @@ isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "core" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* core */; projectDirPath = ""; projectRoot = ""; @@ -624,6 +637,8 @@ 00F043FD10B445F50049C54C /* SkEdgeClipper.cpp in Sources */, 00F043FE10B445F50049C54C /* SkLineClipper.cpp in Sources */, 27CE2BE912393D1D00CF4BB7 /* SkMallocPixelRef.cpp in Sources */, + 277670F512B840CA006811C2 /* SkRegion_rects.cpp in Sources */, + 277670F612B840CA006811C2 /* SkScalar.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; |