diff options
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkPerlinNoiseShader.cpp | 4 | ||||
| -rw-r--r-- | src/effects/SkTableColorFilter.cpp | 5 | ||||
| -rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 87db93d303..0b34d161b1 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -926,10 +926,10 @@ sk_sp<GrFragmentProcessor> SkPerlinNoiseShader::asFragmentProcessor(const AsFPAr new PaintingData(fTileSize, fSeed, fBaseFrequencyX, fBaseFrequencyY, matrix); sk_sp<GrTexture> permutationsTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getPermutationsBitmap(), - GrTextureParams::ClampNoFilter(), args.fGammaTreatment)); + GrTextureParams::ClampNoFilter(), args.fColorMode)); sk_sp<GrTexture> noiseTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getNoiseBitmap(), - GrTextureParams::ClampNoFilter(), args.fGammaTreatment)); + GrTextureParams::ClampNoFilter(), args.fColorMode)); SkMatrix m = *args.fViewMatrix; m.setTranslateX(-localMatrix.getTranslateX() + SK_Scalar1); diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 289dee7aee..cd786dfee6 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -473,8 +473,9 @@ sk_sp<GrFragmentProcessor> ColorTableEffect::Make(GrContext* context, SkBitmap b sk_sp<GrTexture> texture; if (-1 == row) { atlas = nullptr; - texture.reset(GrRefCachedBitmapTexture(context, bitmap, GrTextureParams::ClampNoFilter(), - SkSourceGammaTreatment::kRespect)); + texture.reset( + GrRefCachedBitmapTexture(context, bitmap, GrTextureParams::ClampNoFilter(), + SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware)); } else { texture.reset(SkRef(atlas->getTexture())); } diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 0bd9c8748d..3bf569c888 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -1661,9 +1661,9 @@ GrGradientEffect::GrGradientEffect(const CreateArgs& args) { fCoordTransform.reset(*args.fMatrix, fAtlas->getTexture(), params.filterMode()); fTextureAccess.reset(fAtlas->getTexture(), params); } else { - sk_sp<GrTexture> texture( - GrRefCachedBitmapTexture(args.fContext, bitmap, params, - SkSourceGammaTreatment::kRespect)); + sk_sp<GrTexture> texture(GrRefCachedBitmapTexture( + args.fContext, bitmap, params, + SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware)); if (!texture) { return; } |