commit e877dce203c1cadc7ee97505384661a41cd39c59
author Greg Daniel <egdaniel@google.com> Thu Jul 11 10:52:43 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 11 15:22:23 2019 +0000
tree dd535c6085308a7b3cb0699b35114dbb655cbd3b
parent 455c41a014c7762761c5e286c63662565a3093be

Add kRGBA_8888_SRGB GrColorType and remove GrSRGBEncoded.

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

src/gpu/ccpr/GrCCAtlas.cpp

diff --git a/src/gpu/ccpr/GrCCAtlas.cpp b/src/gpu/ccpr/GrCCAtlas.cpp
index bcf9bc1..aaaff6f 100644
--- a/src/gpu/ccpr/GrCCAtlas.cpp
+++ b/src/gpu/ccpr/GrCCAtlas.cpp
@@ -78,8 +78,7 @@
 
     GrColorType colorType = (CoverageType::kFP16_CoverageCount == fCoverageType)
             ? GrColorType::kAlpha_F16 : GrColorType::kAlpha_8;
-    const GrBackendFormat format =
-            caps.getBackendFormatFromColorType(colorType, GrSRGBEncoded::kNo);
+    const GrBackendFormat format = caps.getBackendFormatFromColorType(colorType);
     GrPixelConfig pixelConfig = (CoverageType::kFP16_CoverageCount == fCoverageType)
             ? kAlpha_half_GrPixelConfig : kAlpha_8_GrPixelConfig;
 

src/gpu/ccpr/GrCCClipPath.cpp

diff --git a/src/gpu/ccpr/GrCCClipPath.cpp b/src/gpu/ccpr/GrCCClipPath.cpp
index 574d744..579489e 100644
--- a/src/gpu/ccpr/GrCCClipPath.cpp
+++ b/src/gpu/ccpr/GrCCClipPath.cpp
@@ -16,8 +16,7 @@
                         int rtHeight, const GrCaps& caps) {
     SkASSERT(!this->isInitialized());
 
-    const GrBackendFormat format = caps.getBackendFormatFromColorType(GrColorType::kAlpha_F16,
-                                                                      GrSRGBEncoded::kNo);
+    const GrBackendFormat format = caps.getBackendFormatFromColorType(GrColorType::kAlpha_F16);
 
     fAtlasLazyProxy = GrProxyProvider::MakeFullyLazyProxy(
             [this](GrResourceProvider* resourceProvider)