Add test configs for instanced rendering

tools/flags/SkCommonFlagsConfig.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommonFlagsConfig.h"
 
 #include <stdlib.h>
@@ skipping 11 matching lines @@
 #endif
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     " hwui"
 #endif
     ;
 
 static const char configHelp[] =
     "Options: 565 8888 debug gpu gl gpudebug gpudft gpunull "
     "msaa16 msaa4 glmsaa4 gpuf16 gpusrgb glsrgb nonrendering null nullgpu "
     "nvpr16 nvpr4 nvprdit16 nvprdit4 glnvpr4 glnvprdit4 pdf skp svg xps"
+    "glinst glinst4 glinstdit4 glinst16 glinstdit16 esinst esinst4 esinsdit4"
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
     " angle"
 #endif
     " angle-gl"
 #endif
 #if SK_COMMAND_BUFFER
     " commandbuffer"
 #endif
 #if SK_MESA
     " mesa"
 #endif
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     " hwui"
 #endif
 #ifdef SK_VULKAN
     " vk vksrgb"
 #endif
     " or use extended form 'backend(option=value,...)'.\n";
 
 static const char configExtendedHelp[] =
     "Extended form: 'backend(option=value,...)'\n\n"
     "Possible backends and options:\n"
 #if SK_SUPPORT_GPU
     "\n"
-    "gpu(api=string,color=string,dit=bool,nvpr=bool,samples=int)\tGPU backend\n"
+    "gpu(api=string,color=string,dit=bool,nvpr=bool,inst=bool,samples=int)\tGPU backend\n"
     "\tapi\ttype: string\tdefault: native.\n"
     "\t    Select graphics API to use with gpu backend.\n"
     "\t    Options:\n"
     "\t\tnative\t\t\tUse platform default OpenGL or OpenGL ES backend.\n"
     "\t\tgl    \t\t\tUse OpenGL.\n"
     "\t\tgles  \t\t\tUse OpenGL ES.\n"
     "\t\tdebug \t\t\tUse debug OpenGL.\n"
     "\t\tnull  \t\t\tUse null OpenGL.\n"
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
@@ skipping 63 matching lines @@
     ;
 
 DEFINE_extended_string(config, defaultConfigs, configHelp, configExtendedHelp);
 
 static const struct {
     const char* predefinedConfig;
     const char* backend;
     const char* options;
 } gPredefinedConfigs[] = {
 #if SK_SUPPORT_GPU
-    { "gpu",        "gpu", "" },
-    { "gl",         "gpu", "api=gl" },
-    { "msaa4",      "gpu", "samples=4" },
-    { "glmsaa4",    "gpu", "api=gl,samples=4" },
-    { "msaa16",     "gpu", "samples=16" },
-    { "nvpr4",      "gpu", "nvpr=true,samples=4" },
-    { "glnvpr4",    "gpu", "api=gl,nvpr=true,samples=4" },
-    { "nvpr16",     "gpu", "nvpr=true,samples=16" },
-    { "nvprdit4",   "gpu", "nvpr=true,samples=4,dit=true" },
-    { "glnvprdit4", "gpu", "api=gl,nvpr=true,samples=4,dit=true" },
-    { "nvprdit16",  "gpu", "nvpr=true,samples=16,dit=true" },
-    { "gpuf16",     "gpu", "color=f16" },
-    { "gpusrgb",    "gpu", "color=srgb" },
-    { "glsrgb",     "gpu", "api=gl,color=srgb" },
-    { "gpudft",     "gpu", "dit=true" },
-    { "gpudebug",   "gpu", "api=debug" },
-    { "gpunull",    "gpu", "api=null" },
-    { "debug",      "gpu", "api=debug" },
-    { "nullgpu",    "gpu", "api=null" }
+    { "gpu",         "gpu", "" },
+    { "gl",          "gpu", "api=gl" },
+    { "msaa4",       "gpu", "samples=4" },
+    { "glmsaa4",     "gpu", "api=gl,samples=4" },
+    { "msaa16",      "gpu", "samples=16" },
+    { "nvpr4",       "gpu", "nvpr=true,samples=4" },
+    { "glnvpr4",     "gpu", "api=gl,nvpr=true,samples=4" },
+    { "nvpr16",      "gpu", "nvpr=true,samples=16" },
+    { "nvprdit4",    "gpu", "nvpr=true,samples=4,dit=true" },
+    { "glnvprdit4",  "gpu", "api=gl,nvpr=true,samples=4,dit=true" },
+    { "nvprdit16",   "gpu", "nvpr=true,samples=16,dit=true" },
+    { "glinst",      "gpu", "api=gl,inst=true" },
+    { "glinst4",     "gpu", "api=gl,inst=true,samples=4" },
+    { "glinstdit4",  "gpu", "api=gl,inst=true,samples=4,dit=true" },
+    { "glinst16",    "gpu", "api=gl,inst=true,samples=16" },
+    { "glinstdit16", "gpu", "api=gl,inst=true,samples=16,dit=true" },
+    { "esinst",      "gpu", "api=gles,inst=true" },
+    { "esinst4",     "gpu", "api=gles,inst=true,samples=4" },
+    { "esinstdit4",  "gpu", "api=gles,inst=true,samples=4,dit=true" },
+    { "gpuf16",      "gpu", "color=f16" },
+    { "gpusrgb",     "gpu", "color=srgb" },
+    { "glsrgb",      "gpu", "api=gl,color=srgb" },
+    { "gpudft",      "gpu", "dit=true" },
+    { "gpudebug",    "gpu", "api=debug" },
+    { "gpunull",     "gpu", "api=null" },
+    { "debug",       "gpu", "api=debug" },
+    { "nullgpu",     "gpu", "api=null" }
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
     , { "angle",      "gpu", "api=angle" }
 #endif
     , { "angle-gl",   "gpu", "api=angle-gl" }
 #endif
 #if SK_COMMAND_BUFFER
     , { "commandbuffer", "gpu", "api=commandbuffer" }
 #endif
 #if SK_MESA
@@ skipping 13 matching lines @@
                                          const SkTArray<SkString>& viaParts)
         : fTag(tag)
         , fBackend(backend)
         , fViaParts(viaParts) {
 }
 SkCommandLineConfig::~SkCommandLineConfig() {
 }
 
 #if SK_SUPPORT_GPU
 SkCommandLineConfigGpu::SkCommandLineConfigGpu(
-    const SkString& tag, const SkTArray<SkString>& viaParts,
-    ContextType contextType, bool useNVPR, bool useDIText, int samples,
-    SkColorType colorType, sk_sp<SkColorSpace> colorSpace)
+    const SkString& tag, const SkTArray<SkString>& viaParts, ContextType contextType, bool useNVPR,
+    bool useInstanced, bool useDIText, int samples, SkColorType colorType,
+    sk_sp<SkColorSpace> colorSpace)
         : SkCommandLineConfig(tag, SkString("gpu"), viaParts)
         , fContextType(contextType)
         , fUseNVPR(useNVPR)
+        , fUseInstanced(useInstanced)
         , fUseDIText(useDIText)
         , fSamples(samples)
         , fColorType(colorType)
         , fColorSpace(std::move(colorSpace)) {
 }
 static bool parse_option_int(const SkString& value, int* outInt) {
     if (value.isEmpty()) {
         return false;
     }
     char* endptr = nullptr;
@@ skipping 87 matching lines @@
 }
 
 SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& tag,
                                                       const SkTArray<SkString>& vias,
                                                       const SkString& options) {
     // Defaults for GPU backend.
     bool seenAPI = false;
     SkCommandLineConfigGpu::ContextType contextType = GrContextFactory::kNativeGL_ContextType;
     bool seenUseNVPR = false;
     bool useNVPR = false;
+    bool seenUseInstanced = false;
+    bool useInstanced = false;
     bool seenUseDIText =false;
     bool useDIText = false;
     bool seenSamples = false;
     int samples = 0;
     bool seenColor = false;
     SkColorType colorType = kN32_SkColorType;
     sk_sp<SkColorSpace> colorSpace = nullptr;
 
     SkTArray<SkString> optionParts;
     SkStrSplit(options.c_str(), ",", kStrict_SkStrSplitMode, &optionParts);
     for (int i = 0; i < optionParts.count(); ++i) {
         SkTArray<SkString> keyValueParts;
         SkStrSplit(optionParts[i].c_str(), "=", kStrict_SkStrSplitMode, &keyValueParts);
         if (keyValueParts.count() != 2) {
             return nullptr;
         }
         const SkString& key = keyValueParts[0];
         const SkString& value = keyValueParts[1];
         bool valueOk = false;
         if (key.equals("api") && !seenAPI) {
             valueOk = parse_option_gpu_api(value, &contextType);
             seenAPI = true;
         } else if (key.equals("nvpr") && !seenUseNVPR) {
             valueOk = parse_option_bool(value, &useNVPR);
             seenUseNVPR = true;
+        } else if (key.equals("inst") && !seenUseInstanced) {
+            valueOk = parse_option_bool(value, &useInstanced);
+            seenUseInstanced = true;
         } else if (key.equals("dit") && !seenUseDIText) {
             valueOk = parse_option_bool(value, &useDIText);
             seenUseDIText = true;
         } else if (key.equals("samples") && !seenSamples) {
             valueOk = parse_option_int(value, &samples);
             seenSamples = true;
         } else if (key.equals("color") && !seenColor) {
             valueOk = parse_option_gpu_color(value, &colorType, &colorSpace);
             seenColor = true;
         }
         if (!valueOk) {
             return nullptr;
         }
     }
-    return new SkCommandLineConfigGpu(tag, vias, contextType, useNVPR, useDIText, samples,
-                                      colorType, colorSpace);
+    return new SkCommandLineConfigGpu(tag, vias, contextType, useNVPR, useInstanced, useDIText,
+                                      samples, colorType, colorSpace);
 }
 #endif
 
 void ParseConfigs(const SkCommandLineFlags::StringArray& configs,
                   SkCommandLineConfigArray* outResult) {
     outResult->reset();
     for (int i = 0; i < configs.count(); ++i) {
         SkString extendedBackend;
         SkString extendedOptions;
         SkString simpleBackend;
@@ skipping 45 matching lines @@
         if (extendedBackend.equals("gpu")) {
             parsedConfig = parse_command_line_config_gpu(tag, vias, extendedOptions);
         }
 #endif
         if (!parsedConfig) {
             parsedConfig = new SkCommandLineConfig(tag, simpleBackend, vias);
         }
         outResult->emplace_back(parsedConfig);
     }
 }