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

diff --git a/src/gpu/GrBackendSurface.cpp b/src/gpu/GrBackendSurface.cpp
index 472cd49..8b3e2f1 100644
--- a/src/gpu/GrBackendSurface.cpp
+++ b/src/gpu/GrBackendSurface.cpp
@@ -45,7 +45,7 @@
             break;
 #endif
         case GrBackendApi::kMock:
-            fMock = that.fMock;
+            fMockColorType = that.fMockColorType;
             break;
         default:
             SK_ABORT("Unknown GrBackend");
@@ -154,29 +154,20 @@
 }
 #endif
 
-GrBackendFormat::GrBackendFormat(GrColorType colorType, GrSRGBEncoded srgbEncoded)
+GrBackendFormat::GrBackendFormat(GrColorType colorType)
         : fBackend(GrBackendApi::kMock)
         , fValid(true)
         , fTextureType(GrTextureType::k2D) {
-    fMock.fColorType = colorType;
-    fMock.fSRGBEncoded = srgbEncoded;
+    fMockColorType = colorType;
 }
 
 const GrColorType* GrBackendFormat::getMockColorType() const {
     if (this->isValid() && GrBackendApi::kMock == fBackend) {
-        return &fMock.fColorType;
+        return &fMockColorType;
     }
     return nullptr;
 }
 
-const GrSRGBEncoded* GrBackendFormat::getMockSRGBEncoded() const {
-    if (this->isValid() && GrBackendApi::kMock == fBackend) {
-        return &fMock.fSRGBEncoded;
-    }
-    return nullptr;
-}
-
-
 GrBackendFormat GrBackendFormat::makeTexture2D() const {
     GrBackendFormat copy = *this;
     if (const GrVkYcbcrConversionInfo* ycbcrInfo = this->getVkYcbcrConversionInfo()) {
@@ -217,8 +208,7 @@
 #endif
             break;
         case GrBackendApi::kMock:
-            return fMock.fColorType == that.fMock.fColorType &&
-                   fMock.fSRGBEncoded == that.fMock.fSRGBEncoded;
+            return fMockColorType == that.fMockColorType;
         default:
             SK_ABORT("Unknown GrBackend");
     }