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 /src/effects/GrAlphaThresholdFragmentProcessor.cpp | |
| 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 'src/effects/GrAlphaThresholdFragmentProcessor.cpp')
| -rw-r--r-- | src/effects/GrAlphaThresholdFragmentProcessor.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.cpp b/src/effects/GrAlphaThresholdFragmentProcessor.cpp index afafe08279..a259607444 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.cpp +++ b/src/effects/GrAlphaThresholdFragmentProcessor.cpp @@ -32,12 +32,6 @@ sk_sp<GrFragmentProcessor> GrAlphaThresholdFragmentProcessor::Make( bounds)); } -static SkMatrix make_div_and_translate_matrix(GrTexture* texture, int x, int y) { - SkMatrix matrix = GrCoordTransform::MakeDivByTextureWHMatrix(texture); - matrix.preTranslate(SkIntToScalar(x), SkIntToScalar(y)); - return matrix; -} - GrAlphaThresholdFragmentProcessor::GrAlphaThresholdFragmentProcessor( GrTexture* texture, sk_sp<GrColorSpaceXform> colorSpaceXform, @@ -47,11 +41,11 @@ GrAlphaThresholdFragmentProcessor::GrAlphaThresholdFragmentProcessor( const SkIRect& bounds) : fInnerThreshold(innerThreshold) , fOuterThreshold(outerThreshold) - , fImageCoordTransform(GrCoordTransform::MakeDivByTextureWHMatrix(texture), texture, - GrSamplerParams::kNone_FilterMode) + , fImageCoordTransform(SkMatrix::I(), texture, GrSamplerParams::kNone_FilterMode) , fImageTextureSampler(texture) , fColorSpaceXform(std::move(colorSpaceXform)) - , fMaskCoordTransform(make_div_and_translate_matrix(maskTexture, -bounds.x(), -bounds.y()), + , fMaskCoordTransform(SkMatrix::MakeTrans(SkIntToScalar(-bounds.x()), + SkIntToScalar(-bounds.y())), maskTexture, GrSamplerParams::kNone_FilterMode) , fMaskTextureSampler(maskTexture) { |