From 180500e5f1d376298de753dc9edefc7e9b25e655 Mon Sep 17 00:00:00 2001 From: brianosman Date: Thu, 7 Jul 2016 13:18:51 -0700 Subject: Revert of Use sRGB pixel config for ARGB masks (color emoji) (patchset #1 id:1 of https://codereview.chromium.org/2129913004/ ) Reason for revert: Color text rendering failing on ANGLE Original issue's description: > Use sRGB pixel config for ARGB masks (color emoji) > > Fixes over-bright color emoji and GM:colortype in sRGB mode > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2129913004 > > Committed: https://skia.googlesource.com/skia/+/920af9fac3d9e275a93910d9c626ee7bc23ed17a TBR=bungeman@google.com,jvanverth@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2128583007 --- src/gpu/text/GrBatchFontCache.cpp | 2 +- src/gpu/text/GrBatchFontCache.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gpu') diff --git a/src/gpu/text/GrBatchFontCache.cpp b/src/gpu/text/GrBatchFontCache.cpp index 3e212cd171..faafc16a13 100644 --- a/src/gpu/text/GrBatchFontCache.cpp +++ b/src/gpu/text/GrBatchFontCache.cpp @@ -18,7 +18,7 @@ bool GrBatchFontCache::initAtlas(GrMaskFormat format) { int index = MaskFormatToAtlasIndex(format); if (!fAtlases[index]) { - GrPixelConfig config = MaskFormatToPixelConfig(format, *fContext->caps()); + GrPixelConfig config = MaskFormatToPixelConfig(format); int width = fAtlasConfigs[index].fWidth; int height = fAtlasConfigs[index].fHeight; int numPlotsX = fAtlasConfigs[index].numPlotsX(); diff --git a/src/gpu/text/GrBatchFontCache.h b/src/gpu/text/GrBatchFontCache.h index 78d7b75961..42612fe8b6 100644 --- a/src/gpu/text/GrBatchFontCache.h +++ b/src/gpu/text/GrBatchFontCache.h @@ -186,11 +186,11 @@ public: void setAtlasSizes_ForTesting(const GrBatchAtlasConfig configs[3]); private: - static GrPixelConfig MaskFormatToPixelConfig(GrMaskFormat format, const GrCaps& caps) { + static GrPixelConfig MaskFormatToPixelConfig(GrMaskFormat format) { static const GrPixelConfig kPixelConfigs[] = { kAlpha_8_GrPixelConfig, kRGB_565_GrPixelConfig, - caps.srgbSupport() ? kSkiaGamma8888_GrPixelConfig : kSkia8888_GrPixelConfig + kSkia8888_GrPixelConfig }; static_assert(SK_ARRAY_COUNT(kPixelConfigs) == kMaskFormatCount, "array_size_mismatch"); -- cgit v1.2.3