Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: bench/benchmain.cpp

Issue 347823004: Remove Sk prefix from some bench classes. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: SkGMBench -> GMBench Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/XfermodeBench.cpp ('k') | dm/DM.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/benchmain.cpp
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index b82dd017b049238acf21d83a4a38639c7830fc54..6b3f5872f2c37dcc453aebef1ecc3c165861d965 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
+#include "BenchLogger.h"
#include "BenchTimer.h"
+#include "Benchmark.h"
#include "CrashHandler.h"
+#include "GMBench.h"
#include "ResultsWriter.h"
-#include "SkBenchLogger.h"
-#include "SkBenchmark.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
#include "SkColorPriv.h"
#include "SkCommandLineFlags.h"
#include "SkData.h"
#include "SkDeferredCanvas.h"
-#include "SkGMBench.h"
#include "SkGraphics.h"
#include "SkImageEncoder.h"
#include "SkOSFile.h"
@@ -56,7 +56,7 @@ class Iter {
public:
Iter() : fBenches(BenchRegistry::Head()), fGMs(skiagm::GMRegistry::Head()) {}
- SkBenchmark* next() {
+ Benchmark* next() {
if (fBenches) {
BenchRegistry::Factory f = fBenches->factory();
fBenches = fBenches->next();
@@ -67,7 +67,7 @@ public:
SkAutoTDelete<skiagm::GM> gm(fGMs->factory()(NULL));
fGMs = fGMs->next();
if (gm->getFlags() & skiagm::GM::kAsBench_Flag) {
- return SkNEW_ARGS(SkGMBench, (gm.detach()));
+ return SkNEW_ARGS(GMBench, (gm.detach()));
}
}
@@ -144,24 +144,24 @@ static void perform_scale(SkCanvas* canvas, int w, int h) {
}
static SkSurface* make_surface(SkColorType colorType, const SkIPoint& size,
- SkBenchmark::Backend backend, int sampleCount,
+ Benchmark::Backend backend, int sampleCount,
GrContext* context) {
SkSurface* surface = NULL;
SkImageInfo info = SkImageInfo::Make(size.fX, size.fY, colorType,
kPremul_SkAlphaType);
switch (backend) {
- case SkBenchmark::kRaster_Backend:
+ case Benchmark::kRaster_Backend:
surface = SkSurface::NewRaster(info);
surface->getCanvas()->clear(SK_ColorWHITE);
break;
#if SK_SUPPORT_GPU
- case SkBenchmark::kGPU_Backend: {
+ case Benchmark::kGPU_Backend: {
surface = SkSurface::NewRenderTarget(context, info, sampleCount);
break;
}
#endif
- case SkBenchmark::kPDF_Backend:
+ case Benchmark::kPDF_Backend:
default:
SkDEBUGFAIL("unsupported");
}
@@ -193,24 +193,24 @@ static const struct Config {
SkColorType fColorType;
const char* name;
int sampleCount;
- SkBenchmark::Backend backend;
+ Benchmark::Backend backend;
GLContextType contextType;
bool runByDefault;
} gConfigs[] = {
- { kN32_SkColorType, "NONRENDERING", 0, SkBenchmark::kNonRendering_Backend, kNative, true},
- { kN32_SkColorType, "8888", 0, SkBenchmark::kRaster_Backend, kNative, true},
- { kRGB_565_SkColorType, "565", 0, SkBenchmark::kRaster_Backend, kNative, true},
+ { kN32_SkColorType, "NONRENDERING", 0, Benchmark::kNonRendering_Backend, kNative, true},
+ { kN32_SkColorType, "8888", 0, Benchmark::kRaster_Backend, kNative, true},
+ { kRGB_565_SkColorType, "565", 0, Benchmark::kRaster_Backend, kNative, true},
#if SK_SUPPORT_GPU
- { kN32_SkColorType, "GPU", 0, SkBenchmark::kGPU_Backend, kNative, true},
- { kN32_SkColorType, "MSAA4", 4, SkBenchmark::kGPU_Backend, kNative, false},
- { kN32_SkColorType, "MSAA16", 16, SkBenchmark::kGPU_Backend, kNative, false},
- { kN32_SkColorType, "NVPRMSAA4", 4, SkBenchmark::kGPU_Backend, kNVPR, true},
- { kN32_SkColorType, "NVPRMSAA16", 16, SkBenchmark::kGPU_Backend, kNVPR, false},
+ { kN32_SkColorType, "GPU", 0, Benchmark::kGPU_Backend, kNative, true},
+ { kN32_SkColorType, "MSAA4", 4, Benchmark::kGPU_Backend, kNative, false},
+ { kN32_SkColorType, "MSAA16", 16, Benchmark::kGPU_Backend, kNative, false},
+ { kN32_SkColorType, "NVPRMSAA4", 4, Benchmark::kGPU_Backend, kNVPR, true},
+ { kN32_SkColorType, "NVPRMSAA16", 16, Benchmark::kGPU_Backend, kNVPR, false},
#if SK_ANGLE
- { kN32_SkColorType, "ANGLE", 0, SkBenchmark::kGPU_Backend, kANGLE, true},
+ { kN32_SkColorType, "ANGLE", 0, Benchmark::kGPU_Backend, kANGLE, true},
#endif // SK_ANGLE
- { kN32_SkColorType, "Debug", 0, SkBenchmark::kGPU_Backend, kDebug, kIsDebug},
- { kN32_SkColorType, "NULLGPU", 0, SkBenchmark::kGPU_Backend, kNull, true},
+ { kN32_SkColorType, "Debug", 0, Benchmark::kGPU_Backend, kDebug, kIsDebug},
+ { kN32_SkColorType, "NULLGPU", 0, Benchmark::kGPU_Backend, kNull, true},
#endif // SK_SUPPORT_GPU
};
@@ -281,7 +281,7 @@ int tool_main(int argc, char** argv) {
SkAutoGraphics ag;
// First, parse some flags.
- SkBenchLogger logger;
+ BenchLogger logger;
if (FLAGS_logFile.count()) {
logger.SetLogFile(FLAGS_logFile[0]);
}
@@ -340,7 +340,7 @@ int tool_main(int argc, char** argv) {
// Non-rendering configs only run in normal mode
for (int i = 0; i < configs.count(); ++i) {
const Config& config = gConfigs[configs[i]];
- if (SkBenchmark::kNonRendering_Backend == config.backend) {
+ if (Benchmark::kNonRendering_Backend == config.backend) {
configs.remove(i, 1);
--i;
}
@@ -351,7 +351,7 @@ int tool_main(int argc, char** argv) {
for (int i = 0; i < configs.count(); ++i) {
const Config& config = gConfigs[configs[i]];
- if (SkBenchmark::kGPU_Backend == config.backend) {
+ if (Benchmark::kGPU_Backend == config.backend) {
GrContext* context = gContextFactory.get(config.contextType);
if (NULL == context) {
SkDebugf("GrContext could not be created for config %s. Config will be skipped.\n",
@@ -409,7 +409,7 @@ int tool_main(int argc, char** argv) {
for (size_t i = 0; i < SK_ARRAY_COUNT(gConfigs); ++i) {
#if SK_SUPPORT_GPU
const Config& config = gConfigs[i];
- if (SkBenchmark::kGPU_Backend != config.backend) {
+ if (Benchmark::kGPU_Backend != config.backend) {
continue;
}
GrContext* context = gContextFactory.get(config.contextType);
@@ -432,9 +432,9 @@ int tool_main(int argc, char** argv) {
// Run each bench in each configuration it supports and we asked for.
Iter iter;
- SkBenchmark* bench;
+ Benchmark* bench;
while ((bench = iter.next()) != NULL) {
- SkAutoTUnref<SkBenchmark> benchUnref(bench);
+ SkAutoTUnref<Benchmark> benchUnref(bench);
if (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getName())) {
continue;
}
@@ -457,7 +457,7 @@ int tool_main(int argc, char** argv) {
GrContext* context = NULL;
#if SK_SUPPORT_GPU
SkGLContextHelper* glContext = NULL;
- if (SkBenchmark::kGPU_Backend == config.backend) {
+ if (Benchmark::kGPU_Backend == config.backend) {
context = gContextFactory.get(config.contextType);
if (NULL == context) {
continue;
@@ -472,7 +472,7 @@ int tool_main(int argc, char** argv) {
const SkIPoint dim = bench->getSize();
SkAutoTUnref<SkSurface> surface;
- if (SkBenchmark::kNonRendering_Backend != config.backend) {
+ if (Benchmark::kNonRendering_Backend != config.backend) {
surface.reset(make_surface(config.fColorType,
dim,
config.backend,
@@ -527,7 +527,7 @@ int tool_main(int argc, char** argv) {
#if SK_SUPPORT_GPU
SkGLContextHelper* contextHelper = NULL;
- if (SkBenchmark::kGPU_Backend == config.backend) {
+ if (Benchmark::kGPU_Backend == config.backend) {
contextHelper = gContextFactory.getGLContext(config.contextType);
}
BenchTimer timer(contextHelper);
@@ -642,7 +642,7 @@ int tool_main(int argc, char** argv) {
}
if (FLAGS_verbose) { SkDebugf("\n"); }
- if (!FLAGS_dryRun && FLAGS_outDir.count() && SkBenchmark::kNonRendering_Backend != config.backend) {
+ if (!FLAGS_dryRun && FLAGS_outDir.count() && Benchmark::kNonRendering_Backend != config.backend) {
SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
if (image.get()) {
saveFile(bench->getName(), config.name, FLAGS_outDir[0],
« no previous file with comments | « bench/XfermodeBench.cpp ('k') | dm/DM.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698