diff options
| author |  cdalton <cdalton@nvidia.com> | 2015-11-13 09:10:31 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-13 09:10:31 -0800 |
| commit | 60795d99fff8caedc2e82bebcfa8bd4fa07231b7 (patch) | |
| tree | a098c1159e134735c0d6dbdc6ce4119217aa2f9b /tools | |
| parent | f844177496e0c9be6d226326daa1638482583f64 (diff) | |
Add visualbench option for nvpr stencil samples
Repurposes the --nvpr flag as an int that says how many stencil samples
to use, or disables nvpr with a value of zero.
BUG=skia:
Review URL: https://codereview.chromium.org/1444543002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/VisualBench/VisualBench.cpp | 2 | ||||
| -rw-r--r-- | tools/VisualBench/VisualBenchmarkStream.cpp | 4 | ||||
| -rw-r--r-- | tools/VisualBench/VisualFlags.cpp | 2 | ||||
| -rw-r--r-- | tools/VisualBench/VisualFlags.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/VisualBench/VisualBench.cpp b/tools/VisualBench/VisualBench.cpp index 5a86c94aec..5ff556d5bb 100644 --- a/tools/VisualBench/VisualBench.cpp +++ b/tools/VisualBench/VisualBench.cpp @@ -103,7 +103,7 @@ void VisualBench::setupContext() { fInterface.reset(GrGLCreateNativeInterface()); // TODO use the GLContext creation factories and also set this all up in configs - if (!FLAGS_nvpr) { + if (0 == FLAGS_nvpr) { fInterface.reset(GrGLInterfaceRemoveNVPR(fInterface)); } SkASSERT(fInterface); diff --git a/tools/VisualBench/VisualBenchmarkStream.cpp b/tools/VisualBench/VisualBenchmarkStream.cpp index 2efb3c886e..cfeff75196 100644 --- a/tools/VisualBench/VisualBenchmarkStream.cpp +++ b/tools/VisualBench/VisualBenchmarkStream.cpp @@ -131,8 +131,8 @@ Benchmark* VisualBenchmarkStream::next() { // TODO move this all to --config if (bench && FLAGS_cpu) { bench = new CpuWrappedBenchmark(fSurfaceProps, bench); - } else if (bench && FLAGS_nvpr) { - bench = new NvprWrappedBenchmark(fSurfaceProps, bench, 4); + } else if (bench && 0 != FLAGS_nvpr) { + bench = new NvprWrappedBenchmark(fSurfaceProps, bench, FLAGS_nvpr); } fBenchmark.reset(bench); diff --git a/tools/VisualBench/VisualFlags.cpp b/tools/VisualBench/VisualFlags.cpp index 2b0e5499ed..5876bde69f 100644 --- a/tools/VisualBench/VisualFlags.cpp +++ b/tools/VisualBench/VisualFlags.cpp @@ -8,4 +8,4 @@ #include "VisualFlags.h" DEFINE_int32(msaa, 0, "Number of msaa samples."); -DEFINE_bool(nvpr, false, "Run in NVPR mode?"); +DEFINE_int32(nvpr, 0, "Number of stencil samples for nvpr, or zero to disable it."); diff --git a/tools/VisualBench/VisualFlags.h b/tools/VisualBench/VisualFlags.h index ad3bdea640..373541029b 100644 --- a/tools/VisualBench/VisualFlags.h +++ b/tools/VisualBench/VisualFlags.h @@ -12,6 +12,6 @@ DECLARE_string(config); DECLARE_int32(msaa); -DECLARE_bool(nvpr); +DECLARE_int32(nvpr); #endif |