add f16 and srgb --configs to nanobench

bench/nanobench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "nanobench.h"
@@ skipping 378 matching lines @@
 #define kBogusGLContextOptions 0
 #endif
 
 static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* configs) {
 
 #if SK_SUPPORT_GPU
     if (const auto* gpuConfig = config->asConfigGpu()) {
         if (!FLAGS_gpu)
             return;
 
-        const auto ctxOptions = gpuConfig->getUseNVPR() ? GrContextFactory::kEnableNVPR_GLContextOptions 
+        const auto ctxOptions = gpuConfig->getUseNVPR() ? GrContextFactory::kEnableNVPR_GLContextOptions
                                                         : GrContextFactory::kNone_GLContextOptions;
         const auto ctxType = gpuConfig->getContextType();
         const auto sampleCount = gpuConfig->getSamples();
 
         if (const GrContext* ctx = gGrFactory->get(ctxType, ctxOptions)) {
             const auto maxSampleCount = ctx->caps()->maxSampleCount();
             if (sampleCount > ctx->caps()->maxSampleCount()) {
                 SkDebugf("Configuration sample count %d exceeds maximum %d.\n",
                     sampleCount, maxSampleCount);
                 return;
             }
         } else {
             SkDebugf("No context was available matching config type and options.\n");
             return;
         }
 
         Config target = {
             gpuConfig->getTag(),
             Benchmark::kGPU_Backend,
             kN32_SkColorType,
             kPremul_SkAlphaType,
+            kLinear_SkColorProfileType,
             sampleCount,
             ctxType,
             ctxOptions,
             gpuConfig->getUseDIText()
         };
 
         configs->push_back(target);
         return;
     }
 #endif
 
-    #define CPU_CONFIG(name, backend, color, alpha)                                  \
-        if (config->getTag().equals(#name)) {                                        \
-            Config config = { SkString(#name), Benchmark::backend, color, alpha, 0,  \
-                              kBogusGLContextType, kBogusGLContextOptions,           \
-                              false };                                               \
-            configs->push_back(config);                                              \
-            return;                                                                  \
+    #define CPU_CONFIG(name, backend, color, alpha, profile)                 \
+        if (config->getTag().equals(#name)) {                                \
+            Config config = {                                                \
+                SkString(#name), Benchmark::backend, color, alpha, profile,  \
+                0, kBogusGLContextType, kBogusGLContextOptions, false        \
+            };                                                               \
+            configs->push_back(config);                                      \
+            return;                                                          \
         }
 
     if (FLAGS_cpu) {
-        CPU_CONFIG(nonrendering, kNonRendering_Backend, kUnknown_SkColorType, kUnpremul_SkAlphaType)
-        CPU_CONFIG(8888, kRaster_Backend, kN32_SkColorType, kPremul_SkAlphaType)
-        CPU_CONFIG(565, kRaster_Backend, kRGB_565_SkColorType, kOpaque_SkAlphaType)
+        CPU_CONFIG(nonrendering, kNonRendering_Backend,
+                   kUnknown_SkColorType, kUnpremul_SkAlphaType, kLinear_SkColorProfileType);
+
+        CPU_CONFIG(8888, kRaster_Backend,
+                   kN32_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType)
+        CPU_CONFIG(565,  kRaster_Backend,
+                   kRGB_565_SkColorType, kOpaque_SkAlphaType, kLinear_SkColorProfileType)
+        CPU_CONFIG(srgb, kRaster_Backend,
+                   kN32_SkColorType,  kPremul_SkAlphaType, kSRGB_SkColorProfileType)
+        CPU_CONFIG(f16,  kRaster_Backend,
+                   kRGBA_F16_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType)
     }
 
     #undef CPU_CONFIG
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     if (config->getTag().equals("hwui")) {
-        Config config = { SkString("hwui"), Benchmark::kHWUI_Backend, kRGBA_8888_SkColorType,
-                          kPremul_SkAlphaType, 0, kBogusGLContextType, kBogusGLContextOptions,
-                          false };
+        Config config = { SkString("hwui"), Benchmark::kHWUI_Backend,
+                          kRGBA_8888_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType,
+                          0, kBogusGLContextType, kBogusGLContextOptions, false };
         configs->push_back(config);
     }
 #endif
 }
 
 // Append all configs that are enabled and supported.
 void create_configs(SkTArray<Config>* configs) {
     SkCommandLineConfigArray array;
     ParseConfigs(FLAGS_config, &array);
     for (int i = 0; i < array.count(); ++i) {
         create_config(array[i], configs);
     }
 }
 
 // If bench is enabled for config, returns a Target* for it, otherwise nullptr.
 static Target* is_enabled(Benchmark* bench, const Config& config) {
     if (!bench->isSuitableFor(config.backend)) {
         return nullptr;
     }
 
     SkImageInfo info = SkImageInfo::Make(bench->getSize().fX, bench->getSize().fY,
-                                         config.color, config.alpha);
+                                         config.color, config.alpha, config.profile);
 
     Target* target = nullptr;
 
     switch (config.backend) {
 #if SK_SUPPORT_GPU
     case Benchmark::kGPU_Backend:
         target = new GPUTarget(config);
         break;
 #endif
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
@@ skipping 790 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif