Remove some uses of GrBytesPerPixel (take 2)
GrPixelConfig needs to go away. Towards that end, switch the Vk and GL backends over to using their native formats.
Change-Id: Ie663d1ec64d19b8940925afc7c39bc057c4112cf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/213482
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
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;
}