From a167e74b4bb78cfbbec3d8768e5853cd0b9314ab Mon Sep 17 00:00:00 2001 From: brianosman Date: Tue, 24 May 2016 06:18:48 -0700 Subject: Remove sRGB overrides on GrTextureParams. Use GrPaint flags instead. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002253002 Review-Url: https://codereview.chromium.org/2002253002 --- src/gpu/GrContext.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/gpu/GrContext.cpp') diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 04fabaa6b3..51ab64d219 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -367,11 +367,10 @@ bool GrContext::writeSurfacePixels(GrSurface* surface, if (!drawContext) { return false; } - // SRGBTODO: AllowSRGBInputs? (We could force it on here, so we don't need the - // per-texture override in config conversion effect?) GrPaint paint; paint.addColorFragmentProcessor(fp); paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); + paint.setAllowSRGBInputs(true); SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height)); drawContext->drawRect(GrNoClip(), paint, matrix, rect, nullptr); @@ -479,11 +478,10 @@ bool GrContext::readSurfacePixels(GrSurface* src, GrConfigConversionEffect::kNone_PMConversion, textureMatrix)); } if (fp) { - // SRGBTODO: AllowSRGBInputs? (We could force it on here, so we don't need the - // per-texture override in config conversion effect?) GrPaint paint; paint.addColorFragmentProcessor(fp); paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); + paint.setAllowSRGBInputs(true); SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height)); sk_sp drawContext( this->drawContext(sk_ref_sp(temp->asRenderTarget()))); -- cgit v1.2.3