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 --- dm/DM.cpp | 11 ++--------- dm/DMSrcSink.cpp | 6 +++++- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'dm') diff --git a/dm/DM.cpp b/dm/DM.cpp index cddaf423ed..6cb9cb5ef5 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -19,8 +19,7 @@ #include "SkColorSpacePriv.h" #include "SkCommonFlags.h" #include "SkCommonFlagsConfig.h" -#include "SkCommonFlagsGpuThreads.h" -#include "SkCommonFlagsPathRenderer.h" +#include "SkCommonFlagsGpu.h" #include "SkData.h" #include "SkDebugfTracer.h" #include "SkDocument.h" @@ -96,10 +95,6 @@ DEFINE_bool(forceRasterPipeline, false, "sets gSkForceRasterPipelineBlitter"); DEFINE_bool(ddl, false, "If true, use DeferredDisplayLists for GPU SKP rendering."); -#if SK_SUPPORT_GPU -DEFINE_pathrenderer_flag; -#endif - DEFINE_bool(ignoreSigInt, false, "ignore SIGINT signals during test execution"); DEFINE_string(dont_write, "", "File extensions to skip writing to --writePath."); // See skia:6821 @@ -1345,9 +1340,7 @@ int main(int argc, char** argv) { GrContextOptions grCtxOptions; #if SK_SUPPORT_GPU - grCtxOptions.fGpuPathRenderers = CollectGpuPathRenderersFromFlags(); - grCtxOptions.fAllowPathMaskCaching = FLAGS_cachePathMasks; - grCtxOptions.fExecutor = GpuExecutorForTools(); + SetCtxOptionsFromCommonFlags(&grCtxOptions); #endif JsonWriter::DumpJson(); // It's handy for the bots to assume this is ~never missing. diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index d3566b6d92..f8be87f592 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -17,6 +17,7 @@ #include "SkColorSpaceXformCanvas.h" #include "SkColorSpace_XYZ.h" #include "SkCommonFlags.h" +#include "SkCommonFlagsGpu.h" #include "SkData.h" #include "SkDebugCanvas.h" #include "SkDeferredDisplayListRecorder.h" @@ -66,7 +67,6 @@ DEFINE_bool(multiPage, false, "For document-type backends, render the source" " into multiple pages"); DEFINE_bool(RAW_threading, true, "Allow RAW decodes to run on multiple threads?"); -DECLARE_int32(gpuThreads); using sk_gpu_test::GrContextFactory; @@ -1584,7 +1584,11 @@ GPUThreadTestingSink::GPUThreadTestingSink(GrContextFactory::ContextType ct, const GrContextOptions& grCtxOptions) : INHERITED(ct, overrides, samples, diText, colorType, alphaType, std::move(colorSpace), threaded, grCtxOptions) +#if SK_SUPPORT_GPU , fExecutor(SkExecutor::MakeFIFOThreadPool(FLAGS_gpuThreads)) { +#else + , fExecutor(nullptr) { +#endif SkASSERT(fExecutor); } -- cgit v1.2.3