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/samplelocations.cpp

diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp
index d3053a9..8c29acc 100644
--- a/gm/samplelocations.cpp
+++ b/gm/samplelocations.cpp
@@ -279,9 +279,9 @@
     );
 
     if (auto offscreenRTC = ctx->priv().makeDeferredRenderTargetContext(
-            rtc->asSurfaceProxy()->backendFormat(), SkBackingFit::kExact, 200, 200,
-            rtc->asSurfaceProxy()->config(), nullptr, rtc->numSamples(), GrMipMapped::kNo,
-            fOrigin)) {
+                rtc->asSurfaceProxy()->backendFormat(), SkBackingFit::kExact, 200, 200,
+                rtc->asSurfaceProxy()->config(), rtc->colorSpaceInfo().colorType(), nullptr,
+                rtc->numSamples(), GrMipMapped::kNo, fOrigin)) {
         offscreenRTC->clear(nullptr, {0,1,0,1}, GrRenderTargetContext::CanClearFullscreen::kYes);
 
         // MIXED SAMPLES TODO: Mixed sampled stencil buffer.