commit b8f098d3721cbd2eb22d00d6f82357000b359318
author Brian Salomon <bsalomon@google.com> Tue Jan 07 11:15:44 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 07 18:44:42 2020 +0000
tree 6e5993ed7ce74b3cc670f855602a931bff9d026e
parent 3f83bfd21c757956d89063e4b0b2f9cb654ce4c6

Reland "Rename GrSimpleTextureEffect->GrTextureEffect"

This reverts commit d7436a37ff3fca9d0f6923f30a7b67da94b5ac1a.

Restores old file order in gpu.gni until Mac/Metal issue can be
debugged.

Change-Id: I6e2ee3bdc3b39270aeaaf28b9613e4ac49d38e1e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262801
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

samplecode/SampleCCPRGeometry.cpp

diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index fe3b280..b6e270d 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp
@@ -193,9 +193,9 @@
 
         // Visualize coverage count in main canvas.
         GrPaint paint;
-        paint.addColorFragmentProcessor(
-                GrSimpleTextureEffect::Make(sk_ref_sp(ccbuff->asTextureProxy()),
-                                            ccbuff->colorInfo().alphaType(), SkMatrix::I()));
+        paint.addColorFragmentProcessor(GrTextureEffect::Make(sk_ref_sp(ccbuff->asTextureProxy()),
+                                                              ccbuff->colorInfo().alphaType(),
+                                                              SkMatrix::I()));
         paint.addColorFragmentProcessor(
                 std::make_unique<VisualizeCoverageCountFP>());
         paint.setPorterDuffXPFactory(SkBlendMode::kSrcOver);