From 67c18d6b5188a0497f6912a73d964c763d2f8f84 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Fri, 20 Jan 2017 12:44:06 -0500 Subject: 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 Commit-Queue: Robert Phillips --- src/effects/SkDisplacementMapEffect.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/effects/SkDisplacementMapEffect.cpp') diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 28483bd57a..0d3940317f 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -336,9 +336,8 @@ sk_sp SkDisplacementMapEffect::onFilterImage(SkSpecialImage* sou return nullptr; } - SkMatrix offsetMatrix = GrCoordTransform::MakeDivByTextureWHMatrix(displTexture.get()); - offsetMatrix.preTranslate(SkIntToScalar(colorOffset.fX - displOffset.fX), - SkIntToScalar(colorOffset.fY - displOffset.fY)); + SkMatrix offsetMatrix = SkMatrix::MakeTrans(SkIntToScalar(colorOffset.fX - displOffset.fX), + SkIntToScalar(colorOffset.fY - displOffset.fY)); SkColorSpace* colorSpace = ctx.outputProperties().colorSpace(); sk_sp colorSpaceXform = GrColorSpaceXform::Make(color->getColorSpace(), colorSpace); -- cgit v1.2.3