Add ContextOptions field to SkCommandLineConfigGpu

tools/flags/SkCommonFlagsConfig.h

 /*
  * 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
 
@@ skipping 33 matching lines @@
 };
 
 #if SK_SUPPORT_GPU
 // SkCommandLineConfigGpu is a SkCommandLineConfig that extracts information out of the backend
 // part of the tag. It is constructed tags that have:
 // * backends of form "gpu(option=value,option2=value,...)"
 // * backends that represent a shorthand of above (such as "msaa16" representing "gpu(samples=16)")
 class SkCommandLineConfigGpu : public SkCommandLineConfig {
   public:
     typedef sk_gpu_test::GrContextFactory::ContextType ContextType;
+    typedef sk_gpu_test::GrContextFactory::ContextOptions ContextOptions;
     SkCommandLineConfigGpu(const SkString& tag, const SkTArray<SkString>& viaParts,
                            ContextType contextType, bool useNVPR, bool useInstanced, bool useDIText,
                            int samples, SkColorType colorType, sk_sp<SkColorSpace> colorSpace);
     const SkCommandLineConfigGpu* asConfigGpu() const override { return this; }
     ContextType getContextType() const { return fContextType; }
-    bool getUseNVPR() const { return fUseNVPR; }
-    bool getUseInstanced() const { return fUseInstanced; }
+    ContextOptions getContextOptions() const { return fContextOptions; }
+    bool getUseNVPR() const { return fContextOptions & ContextOptions::kEnableNVPR; }
+    bool getUseInstanced() const { return fContextOptions & ContextOptions::kUseInstanced; }
     bool getUseDIText() const { return fUseDIText; }
     int getSamples() const { return fSamples; }
     SkColorType getColorType() const { return fColorType; }
     SkColorSpace* getColorSpace() const { return fColorSpace.get(); }
 
   private:
     ContextType fContextType;
-    bool fUseNVPR;
-    bool fUseInstanced;
+    ContextOptions fContextOptions;
     bool fUseDIText;
     int fSamples;
     SkColorType fColorType;
     sk_sp<SkColorSpace> fColorSpace;
 };
 #endif
 
 typedef SkTArray<SkAutoTDelete<SkCommandLineConfig>, true> SkCommandLineConfigArray;
 void ParseConfigs(const SkCommandLineFlags::StringArray& configList,
                   SkCommandLineConfigArray* outResult);
 
 #endif