diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-01-20 12:44:06 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-20 18:18:18 +0000 |
| commit | 67c18d6b5188a0497f6912a73d964c763d2f8f84 (patch) | |
| tree | d32888c6b13589c2718fc6673f29acf2bb546c38 /experimental | |
| parent | 41398f430dc501d450e04540a83b6aa5baf87cd7 (diff) | |
Continue making Ganesh use absolute texture coordinates - take 2
The idea here is that the GrCoordTransform will actually hold a GrTextureProxy (rather than a GrTexture) and then, in GrGLSLPrimitiveProcessor::GetTransformMatrix, use the instantiated width & height (when uploading the transform matrix)
Relanding of: https://skia-review.googlesource.com/c/6977/
Change-Id: Ibc9b9e354f7fc23b1a6e6e4fe7c9fe3cef771c02
Reviewed-on: https://skia-review.googlesource.com/7265
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@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 6050a5c5c0..95152fadd6 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)); + textureParams, nullptr)); sk_sp<GrTexture> gradientTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getGradientBitmap(), - textureParams)); + textureParams, nullptr)); 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())); + GrSamplerParams::ClampNoFilter(), nullptr)); sk_sp<GrTexture> noiseTexture( GrRefCachedBitmapTexture(args.fContext, paintingData->getNoiseBitmap(), - GrSamplerParams::ClampNoFilter())); + GrSamplerParams::ClampNoFilter(), nullptr)); if ((permutationsTexture) && (noiseTexture)) { sk_sp<GrFragmentProcessor> inner( |