Remove useless options from bench
BUG=skia:
R=jcgregorio@google.com, bensong@google.com, bsalomon@google.com, robertphillips@google.com, reed@google.com
Author: kelvinly@google.com
Review URL: https://codereview.chromium.org/375863006
diff --git a/bench/Benchmark.cpp b/bench/Benchmark.cpp
index ae614f0..04223dc 100644
--- a/bench/Benchmark.cpp
+++ b/bench/Benchmark.cpp
@@ -16,8 +16,6 @@
Benchmark::Benchmark() {
fForceAlpha = 0xFF;
- fForceAA = true;
- fForceFilter = false;
fDither = SkTriState::kDefault;
fOrMask = fClearMask = 0;
}
@@ -40,9 +38,8 @@
void Benchmark::setupPaint(SkPaint* paint) {
paint->setAlpha(fForceAlpha);
- paint->setAntiAlias(fForceAA);
- paint->setFilterLevel(fForceFilter ? SkPaint::kLow_FilterLevel
- : SkPaint::kNone_FilterLevel);
+ paint->setAntiAlias(true);
+ paint->setFilterLevel(SkPaint::kNone_FilterLevel);
paint->setFlags((paint->getFlags() & ~fClearMask) | fOrMask);
diff --git a/bench/Benchmark.h b/bench/Benchmark.h
index db70bbe..8e8eeff 100644
--- a/bench/Benchmark.h
+++ b/bench/Benchmark.h
@@ -76,14 +76,6 @@
fForceAlpha = alpha;
}
- void setForceAA(bool aa) {
- fForceAA = aa;
- }
-
- void setForceFilter(bool filter) {
- fForceFilter = filter;
- }
-
void setDither(SkTriState::State state) {
fDither = state;
}
@@ -115,8 +107,6 @@
private:
int fForceAlpha;
- bool fForceAA;
- bool fForceFilter;
SkTriState::State fDither;
uint32_t fOrMask, fClearMask;
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index c1c1e3f..f3fdb9f 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -225,8 +225,6 @@
DEFINE_bool(scale, false, "Scale canvas before bench run?");
DEFINE_bool(clip, false, "Clip canvas before bench run?");
-DEFINE_bool(forceAA, true, "Force anti-aliasing?");
-DEFINE_bool(forceFilter, false, "Force bitmap filtering?");
DEFINE_string(forceDither, "default", "Force dithering: true, false, or default?");
DEFINE_bool(forceBlend, false, "Force alpha blending?");
@@ -415,8 +413,6 @@
}
writer.option("mode", FLAGS_mode[0]);
writer.option("alpha", SkStringPrintf("0x%02X", alpha).c_str());
- writer.option("antialias", SkStringPrintf("%d", FLAGS_forceAA).c_str());
- writer.option("filter", SkStringPrintf("%d", FLAGS_forceFilter).c_str());
writer.option("dither", SkTriState::Name[dither]);
writer.option("rotate", SkStringPrintf("%d", FLAGS_rotate).c_str());
@@ -476,8 +472,6 @@
}
bench->setForceAlpha(alpha);
- bench->setForceAA(FLAGS_forceAA);
- bench->setForceFilter(FLAGS_forceFilter);
bench->setDither(dither);
bench->preDraw();