From 5d4cd9ea8818f65bb4878c050dbdb9dcd48505ad Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 9 Feb 2017 11:16:46 -0500 Subject: Re-enable processor optimization test with some fixes. Enables on GL (for now) Change-Id: I5f5a38632963dd705f8434e8627eb33446e8f027 Reviewed-on: https://skia-review.googlesource.com/7721 Reviewed-by: Greg Daniel Commit-Queue: Brian Salomon --- src/gpu/effects/GrConfigConversionEffect.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/gpu/effects/GrConfigConversionEffect.cpp') diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index d9a6fefc1e..771eba80f7 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -98,7 +98,7 @@ GrConfigConversionEffect::GrConfigConversionEffect(GrTexture* texture, const GrSwizzle& swizzle, PMConversion pmConversion, const SkMatrix& matrix) - : INHERITED(texture, nullptr, matrix, ModulationFlags(texture->config())) + : INHERITED(texture, nullptr, matrix, kNone_OptimizationFlags) , fSwizzle(swizzle) , fPMConversion(pmConversion) { this->initClassID(); @@ -112,13 +112,14 @@ GrConfigConversionEffect::GrConfigConversionEffect(GrTexture* texture, } GrConfigConversionEffect::GrConfigConversionEffect(GrContext* context, - sk_sp proxy, + sk_sp + proxy, const GrSwizzle& swizzle, PMConversion pmConversion, const SkMatrix& matrix) - : INHERITED(context, ModulationFlags(proxy->config()), proxy, nullptr, matrix) - , fSwizzle(swizzle) - , fPMConversion(pmConversion) { + : INHERITED(context, kNone_OptimizationFlags, proxy, nullptr, matrix) + , fSwizzle(swizzle) + , fPMConversion(pmConversion) { this->initClassID(); // We expect to get here with non-BGRA/RGBA only if we're doing not doing a premul/unpremul // conversion. -- cgit v1.2.3