Respect color type and gamma settings in nanobench GPU configs

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 384 matching lines @@
 #define kBogusContextOptions 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_ContextOptions
-                                                        : GrContextFactory::kNone_ContextOptions;
+        auto ctxOptions = GrContextFactory::kNone_ContextOptions;
+        if (gpuConfig->getUseNVPR()) {
+            ctxOptions = static_cast<GrContextFactory::ContextOptions>(
+                ctxOptions | GrContextFactory::kEnableNVPR_ContextOptions);
+        }
+        if (SkColorAndColorSpaceAreGammaCorrect(gpuConfig->getColorType(),
+                                                gpuConfig->getColorSpace())) {
+            ctxOptions = static_cast<GrContextFactory::ContextOptions>(
+                ctxOptions | GrContextFactory::kRequireSRGBSupport_ContextOptions);
+        }
         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,
+            gpuConfig->getColorType(),
             kPremul_SkAlphaType,
-            nullptr,
+            sk_ref_sp(gpuConfig->getColorSpace()),
             sampleCount,
             ctxType,
             ctxOptions,
             gpuConfig->getUseDIText()
         };
 
         configs->push_back(target);
         return;
     }
 #endif
@@ skipping 850 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif