From 040238bded7b932b916c84912cbaec1207aa29c0 Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Mon, 18 Dec 2017 14:22:34 -0700 Subject: Add a tools flag to suppress geometry shaders Bug: skia: Change-Id: I38736c5d49e3b281c2d23af3908575274ff97b5c Reviewed-on: https://skia-review.googlesource.com/86282 Reviewed-by: Brian Salomon Reviewed-by: Brian Osman Commit-Queue: Chris Dalton --- bench/nanobench.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'bench/nanobench.cpp') diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 76d5371869..a50138a624 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -30,8 +30,7 @@ #include "SkCodec.h" #include "SkCommonFlags.h" #include "SkCommonFlagsConfig.h" -#include "SkCommonFlagsGpuThreads.h" -#include "SkCommonFlagsPathRenderer.h" +#include "SkCommonFlagsGpu.h" #include "SkData.h" #include "SkDebugfTracer.h" #include "SkEventTracingPriv.h" @@ -135,10 +134,6 @@ DEFINE_string(benchType, "", DEFINE_bool(forceRasterPipeline, false, "sets gSkForceRasterPipelineBlitter"); -#if SK_SUPPORT_GPU -DEFINE_pathrenderer_flag; -#endif - static double now_ms() { return SkTime::GetNSecs() * 1e-6; } static SkString humanize(double ms) { @@ -1150,9 +1145,7 @@ int main(int argc, char** argv) { SkTaskGroup::Enabler enabled(FLAGS_threads); #if SK_SUPPORT_GPU - grContextOpts.fGpuPathRenderers = CollectGpuPathRenderersFromFlags(); - grContextOpts.fAllowPathMaskCaching = FLAGS_cachePathMasks; - grContextOpts.fExecutor = GpuExecutorForTools(); + SetCtxOptionsFromCommonFlags(&grContextOpts); #endif if (FLAGS_veryVerbose) { -- cgit v1.2.3