diff options
author | Brian Osman <brianosman@google.com> | 2016-12-09 14:51:59 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 20:31:23 +0000 |
commit | 61624f0c716b576706659750d87b6956f4c15722 (patch) | |
tree | 00122b478cf21327b70364fefc5f3f9a6169377e /experimental | |
parent | 073285c0595d46205d1482cc19af2d7d891bfeae (diff) |
Plumb dst color space in many places, rather than "mode"
This is less to type in most cases, and gives us more information
(for things like picture-backed images, where we need to know all
about the destination surface).
Additionally, strip out the plumbing entirely for bitmap sources,
where we don't need to know anything.
BUG=skia:
Change-Id: I4deff6c7c345fcf62eb08b2aff0560adae4313da
Reviewed-on: https://skia-review.googlesource.com/5748
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index f3040673fc..6050a5c5c0 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -1323,10 +1323,10 @@ sk_sp<GrFragmentProcessor> SkPerlinNoiseShader2::asFragmentProcessor(const AsFPA GrSamplerParams::FilterMode::kNone_FilterMode); sk_sp<GrTexture> permutationsTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getImprovedPermutationsBitmap(), - textureParams, args.fColorMode)); + textureParams)); sk_sp<GrTexture> gradientTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getGradientBitmap(), - textureParams, args.fColorMode)); + textureParams)); return GrImprovedPerlinNoiseEffect::Make(fNumOctaves, fSeed, paintingData, permutationsTexture.get(), gradientTexture.get(), m); @@ -1350,10 +1350,10 @@ sk_sp<GrFragmentProcessor> SkPerlinNoiseShader2::asFragmentProcessor(const AsFPA sk_sp<GrTexture> permutationsTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getPermutationsBitmap(), - GrSamplerParams::ClampNoFilter(), args.fColorMode)); + GrSamplerParams::ClampNoFilter())); sk_sp<GrTexture> noiseTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getNoiseBitmap(), - GrSamplerParams::ClampNoFilter(), args.fColorMode)); + GrSamplerParams::ClampNoFilter())); if ((permutationsTexture) && (noiseTexture)) { sk_sp<GrFragmentProcessor> inner( |