From 4ff653cab2e1e3cfb02c91df9c9013fc927aa1ee Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 14 Dec 2015 05:58:25 -0800 Subject: Revert of Add config options to run different GPU APIs to dm and nanobench (patchset #12 id:220001 of https://codereview.chromium.org/1490113005/ ) Reason for revert: speculative revert to see if it unblocks the DEPS roll https://codereview.chromium.org/1529443002 Original issue's description: > Add config options to run different GPU APIs to dm and nanobench > > Add extended config specification form that can be used to run different > gpu backend with different APIs. > > The configs can be specified with the form: > gpu(api=string,dit=bool,nvpr=bool,samples=int) > > This replaces and removes the --gpuAPI flag. > > All existing configs should still work. > > Adds following documentation: > > out/Debug/dm --help config > > Flags: > --config: type: string default: 565 8888 gpu nonrendering > Options: 565 8888 debug gpu gpudebug gpudft gpunull msaa16 msaa4 > nonrendering null nullgpu nvprmsaa16 nvprmsaa4 pdf pdf_poppler skp svg > xps or use extended form 'backend(option=value,...)'. > > Extended form: 'backend(option=value,...)' > > Possible backends and options: > > gpu(api=string,dit=bool,nvpr=bool,samples=int) GPU backend > api type: string default: native. > Select graphics API to use with gpu backend. > Options: > native Use platform default OpenGL or OpenGL ES backend. > gl Use OpenGL. > gles Use OpenGL ES. > debug Use debug OpenGL. > null Use null OpenGL. > dit type: bool default: false. > Use device independent text. > nvpr type: bool default: false. > Use NV_path_rendering OpenGL and OpenGL ES extension. > samples type: int default: 0. > Use multisampling with N samples. > > Predefined configs: > > gpu = gpu() > msaa4 = gpu(samples=4) > msaa16 = gpu(samples=16) > nvprmsaa4 = gpu(nvpr=true,samples=4) > nvprmsaa16 = gpu(nvpr=true,samples=16) > gpudft = gpu(dit=true) > gpudebug = gpu(api=debug) > gpunull = gpu(api=null) > debug = gpu(api=debug) > nullgpu = gpu(api=null) > > BUG=skia:2992 > > Committed: https://skia.googlesource.com/skia/+/e13ca329fca4c28cf4e078561f591ab27b743d23 TBR=bsalomon@google.com,scroggo@google.com,joshualitt@google.com,kkinnunen@nvidia.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:2992 Review URL: https://codereview.chromium.org/1528473002 --- tools/flags/SkCommonFlagsConfig.h | 70 --------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 tools/flags/SkCommonFlagsConfig.h (limited to 'tools/flags/SkCommonFlagsConfig.h') diff --git a/tools/flags/SkCommonFlagsConfig.h b/tools/flags/SkCommonFlagsConfig.h deleted file mode 100644 index 54a076900e..0000000000 --- a/tools/flags/SkCommonFlagsConfig.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SK_COMMON_FLAGS_CONFIG_H -#define SK_COMMON_FLAGS_CONFIG_H - -#include "SkCommandLineFlags.h" - -#if SK_SUPPORT_GPU -#include "GrContextFactory.h" -#endif - -DECLARE_string(config); - -#if SK_SUPPORT_GPU -class SkCommandLineConfigGpu; -#endif - -// SkCommandLineConfig represents a Skia rendering configuration string. -// The string has following form: -// [via-]*tag -// where 'tag' consists of chars excluding hyphen or "angle-gl" -// and each 'via' consists of chars excluding hyphen. -class SkCommandLineConfig { - public: - SkCommandLineConfig(const SkString& tag, const SkTArray& viaParts); - virtual ~SkCommandLineConfig(); -#if SK_SUPPORT_GPU - virtual const SkCommandLineConfigGpu* asConfigGpu() const { return nullptr; } -#endif - const SkString& getTag() const { return fTag; } - const SkTArray& getViaParts() const { return fViaParts; } - private: - SkString fTag; - SkTArray fViaParts; -}; - -#if SK_SUPPORT_GPU -// SkCommandLineConfigGpu is a SkCommandLineConfig that extracts information out of the tag. It is -// constructed configs that have: -// * tags of form "gpu(option=value,option2=value,...)" -// * tags that represent a shorthand of above (such as "msaa16" representing "gpu(samples=16)") -class SkCommandLineConfigGpu : public SkCommandLineConfig { - public: - typedef GrContextFactory::GLContextType ContextType; - SkCommandLineConfigGpu(const SkString& tag, const SkTArray& viaParts, - ContextType contextType, bool useNVPR, bool useDIText, int samples); - const SkCommandLineConfigGpu* asConfigGpu() const override { return this; } - ContextType getContextType() const { return fContextType; } - bool getUseNVPR() const { return fUseNVPR; } - bool getUseDIText() const { return fUseDIText; } - int getSamples() const { return fSamples; } - - private: - ContextType fContextType; - bool fUseNVPR; - bool fUseDIText; - int fSamples; -}; -#endif - -typedef SkTArray, true> SkCommandLineConfigArray; -void ParseConfigs(const SkCommandLineFlags::StringArray& configList, - SkCommandLineConfigArray* outResult); - -#endif -- cgit v1.2.3