diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-02-09 11:16:46 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-09 19:25:21 +0000 |
| commit | 5d4cd9ea8818f65bb4878c050dbdb9dcd48505ad (patch) | |
| tree | 1cbcb0c31ffd9c5d592f8c84cfe59b7da3c074ec /src/gpu/effects/GrConfigConversionEffect.cpp | |
| parent | e659c7f36fef20a6b1605c6b29d1642b4f1f01b5 (diff) | |
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 <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/effects/GrConfigConversionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
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<GrConfigConversionEffect>(); @@ -112,13 +112,14 @@ GrConfigConversionEffect::GrConfigConversionEffect(GrTexture* texture, } GrConfigConversionEffect::GrConfigConversionEffect(GrContext* context, - sk_sp<GrTextureProxy> proxy, + sk_sp<GrTextureProxy> + 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<GrConfigConversionEffect>(); // We expect to get here with non-BGRA/RGBA only if we're doing not doing a premul/unpremul // conversion. |