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/gpu/GrTextureMaker.h | |
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/gpu/GrTextureMaker.h')
-rw-r--r-- | src/gpu/GrTextureMaker.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/GrTextureMaker.h b/src/gpu/GrTextureMaker.h index 0ea5f6d009..767d4ffa3b 100644 --- a/src/gpu/GrTextureMaker.h +++ b/src/gpu/GrTextureMaker.h @@ -19,10 +19,12 @@ public: /** * Returns a texture that is safe for use with the params. If the size of the returned texture * does not match width()/height() then the contents of the original must be scaled to fit - * the texture. Places the color space of the texture in (*texColorSpace). + * the texture. Additionally, the 'scaleAdjust' must be applied to the texture matrix + * in order to correct the absolute texture coordinates. + * Places the color space of the texture in (*texColorSpace). */ GrTexture* refTextureForParams(const GrSamplerParams&, SkColorSpace* dstColorSpace, - sk_sp<SkColorSpace>* texColorSpace); + sk_sp<SkColorSpace>* texColorSpace, SkScalar scaleAdjust[2]); sk_sp<GrFragmentProcessor> createFragmentProcessor( const SkMatrix& textureMatrix, |