commit d628747dfb546a92e5aa0968f1f11c01939c7de6
author Brian Salomon <bsalomon@google.com> Mon Jun 24 15:50:07 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 25 14:29:09 2019 +0000
tree 6abe38fa680433d85edb60e0f609ccb2b523b0aa
parent 8b23d0ee5355b2d6e5898ec43adcdfe7d982e78c

Make GrColorSpaceInfo store GrColorType.

This is largely redundant with GrPixelConfig. However, we intend to
remove GrPixelConfig.

Bug: skia:7580

Change-Id: I03d92303be832711f7821f8a97d36387c9b04a9f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222883
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

gm/clockwise.cpp

diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index 0fa0935..5ffd0fc 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -187,9 +187,9 @@
 
     // Draw the test to an off-screen, top-down render target.
     if (auto topLeftRTC = ctx->priv().makeDeferredRenderTargetContext(
-            rtc->asSurfaceProxy()->backendFormat(), SkBackingFit::kExact, 100, 200,
-            rtc->asSurfaceProxy()->config(), nullptr, 1, GrMipMapped::kNo,
-            kTopLeft_GrSurfaceOrigin, nullptr, SkBudgeted::kYes)) {
+                rtc->asSurfaceProxy()->backendFormat(), SkBackingFit::kExact, 100, 200,
+                rtc->asSurfaceProxy()->config(), rtc->colorSpaceInfo().colorType(), nullptr, 1,
+                GrMipMapped::kNo, kTopLeft_GrSurfaceOrigin, nullptr, SkBudgeted::kYes)) {
         topLeftRTC->clear(nullptr, SK_PMColor4fTRANSPARENT,
                           GrRenderTargetContext::CanClearFullscreen::kYes);
         topLeftRTC->priv().testingOnly_addDrawOp(ClockwiseTestOp::Make(ctx, false, 0));
@@ -204,9 +204,9 @@
 
     // Draw the test to an off-screen, bottom-up render target.
     if (auto topLeftRTC = ctx->priv().makeDeferredRenderTargetContext(
-            rtc->asSurfaceProxy()->backendFormat(), SkBackingFit::kExact, 100, 200,
-            rtc->asSurfaceProxy()->config(), nullptr, 1, GrMipMapped::kNo,
-            kBottomLeft_GrSurfaceOrigin, nullptr, SkBudgeted::kYes)) {
+                rtc->asSurfaceProxy()->backendFormat(), SkBackingFit::kExact, 100, 200,
+                rtc->asSurfaceProxy()->config(), rtc->colorSpaceInfo().colorType(), nullptr, 1,
+                GrMipMapped::kNo, kBottomLeft_GrSurfaceOrigin, nullptr, SkBudgeted::kYes)) {
         topLeftRTC->clear(nullptr, SK_PMColor4fTRANSPARENT,
                           GrRenderTargetContext::CanClearFullscreen::kYes);
         topLeftRTC->priv().testingOnly_addDrawOp(ClockwiseTestOp::Make(ctx, false, 0));