commit 13f02be29175e2958af80efd0c3a253763907e06
author Robert Phillips <robertphillips@google.com> Mon May 13 14:53:27 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon May 13 19:32:12 2019 +0000
tree 38f93940d8be2e3e0d65b618a1650f4c066b608b
parent 2b8b06e79309f7d6441d0251e1bca0d81a7c1713

Remove some uses of GrBytesPerPixel

GrPixelConfig needs to go away. Towards that end, switch the Vk and GL backends over to using their native formats.

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

src/gpu/text/GrAtlasManager.cpp

diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index abd0b20..d736478 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -21,35 +21,20 @@
 
 GrAtlasManager::~GrAtlasManager() = default;
 
-static GrPixelConfig mask_format_to_pixel_config(GrMaskFormat format) {
+static GrColorType mask_format_to_gr_color_type(GrMaskFormat format) {
     switch (format) {
         case kA8_GrMaskFormat:
-            return kAlpha_8_GrPixelConfig;
+            return GrColorType::kAlpha_8;
         case kA565_GrMaskFormat:
-            return kRGB_565_GrPixelConfig;
+            return GrColorType::kRGB_565;
         case kARGB_GrMaskFormat:
-            return kRGBA_8888_GrPixelConfig;
+            return GrColorType::kRGBA_8888;
         default:
             SkDEBUGFAIL("unsupported GrMaskFormat");
-            return kAlpha_8_GrPixelConfig;
+            return GrColorType::kAlpha_8;
     }
 }
 
-static SkColorType mask_format_to_color_type(GrMaskFormat format) {
-    switch (format) {
-        case kA8_GrMaskFormat:
-            return kAlpha_8_SkColorType;
-        case kA565_GrMaskFormat:
-            return kRGB_565_SkColorType;
-        case kARGB_GrMaskFormat:
-            return kRGBA_8888_SkColorType;
-        default:
-            SkDEBUGFAIL("unsupported GrMaskFormat");
-            return kAlpha_8_SkColorType;
-    }
-
-}
-
 void GrAtlasManager::freeAll() {
     for (int i = 0; i < kMaskFormatCount; ++i) {
         fAtlases[i] = nullptr;
@@ -175,17 +160,18 @@
 bool GrAtlasManager::initAtlas(GrMaskFormat format) {
     int index = MaskFormatToAtlasIndex(format);
     if (fAtlases[index] == nullptr) {
-        GrPixelConfig config = mask_format_to_pixel_config(format);
-        SkColorType colorType = mask_format_to_color_type(format);
+        GrColorType grColorType = mask_format_to_gr_color_type(format);
         SkISize atlasDimensions = fAtlasConfig.atlasDimensions(format);
         SkISize plotDimensions = fAtlasConfig.plotDimensions(format);
 
-        const GrBackendFormat format = fCaps->getBackendFormatFromColorType(colorType);
+        const GrBackendFormat format = fCaps->getBackendFormatFromGrColorType(grColorType,
+                                                                              GrSRGBEncoded::kNo);
 
         fAtlases[index] = GrDrawOpAtlas::Make(
-                fProxyProvider, format, config, atlasDimensions.width(), atlasDimensions.height(),
-                plotDimensions.width(), plotDimensions.height(), fAllowMultitexturing,
-                &GrStrikeCache::HandleEviction, fGlyphCache);
+                fProxyProvider, format, grColorType,
+                atlasDimensions.width(), atlasDimensions.height(),
+                plotDimensions.width(), plotDimensions.height(),
+                fAllowMultitexturing, &GrStrikeCache::HandleEviction, fGlyphCache);
         if (!fAtlases[index]) {
             return false;
         }