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 --- tests/IntTextureTest.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/IntTextureTest.cpp') diff --git a/tests/IntTextureTest.cpp b/tests/IntTextureTest.cpp index a3e17bf644..3edd4cc986 100644 --- a/tests/IntTextureTest.cpp +++ b/tests/IntTextureTest.cpp @@ -207,9 +207,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(IntTexture, reporter, ctxInfo) { }; for (auto filter : kNamedFilters) { - SkMatrix m; - m.setIDiv(kS, kS); - sk_sp fp(GrSimpleTextureEffect::Make(texture.get(), nullptr, m, + sk_sp fp(GrSimpleTextureEffect::Make(texture.get(), nullptr, + SkMatrix::I(), filter.fMode)); REPORTER_ASSERT(reporter, fp); if (!fp) { -- cgit v1.2.3