commit 1a48e13303ec58ea2c6411651f19baf765b66651
author brianosman <brianosman@google.com> Mon Jun 20 09:41:41 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 20 09:41:41 2016 -0700
tree 490eb5810135a339bc50a9c620973a1742b6170a
parent 52ede1d905728cdcaa98db1e4a33724f5a85c62d

Respect color type and gamma settings in nanobench GPU configs

We were ignoring the requested properties in things like gpuf16 and
gpusrgb.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2075133003

Review-Url: https://codereview.chromium.org/2075133003

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index cb28231..5ab5e46 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -402,8 +402,16 @@
         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();
 
@@ -422,9 +430,9 @@
         Config target = {
             gpuConfig->getTag(),
             Benchmark::kGPU_Backend,
-            kN32_SkColorType,
+            gpuConfig->getColorType(),
             kPremul_SkAlphaType,
-            nullptr,
+            sk_ref_sp(gpuConfig->getColorSpace()),
             sampleCount,
             ctxType,
             ctxOptions,