commit c241b5896524439fa8028619b112834a8e68fc4a
author Brian Salomon <bsalomon@google.com> Wed Nov 27 08:57:17 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 27 14:32:43 2019 +0000
tree c069e1e241adb2f977c3e87d1b6cd1563fd9947e
parent 315c8dc6b89993f5322288d57cf78681c87566b5

Make fragment processor iterators work with range for loops.

When iterating over the coord transforms or texture samplers of a
FP also have access to the owning FP.

Pass a coord transform range to GPs rather than a pointer to an
iterator.

Change-Id: If7c829a67dce6600d7f49e12d6f49f685dcace3a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256216
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

src/gpu/glsl/GrGLSLGeometryProcessor.cpp

diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
index d99239e..adb20fa 100644
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
@@ -102,10 +102,10 @@
 
 void GrGLSLGeometryProcessor::setTransformDataHelper(const SkMatrix& localMatrix,
                                                      const GrGLSLProgramDataManager& pdman,
-                                                     FPCoordTransformIter* transformIter) {
+                                                     const CoordTransformRange& transformRange) {
     int i = 0;
-    while (const GrCoordTransform* coordTransform = transformIter->next()) {
-        const SkMatrix& m = GetTransformMatrix(localMatrix, *coordTransform);
+    for (auto [transform, fp] : transformRange) {
+        const SkMatrix& m = GetTransformMatrix(localMatrix, transform);
         if (!fInstalledTransforms[i].fCurrentValue.cheapEqualTo(m)) {
             pdman.setSkMatrix(fInstalledTransforms[i].fHandle.toIndex(), m);
             fInstalledTransforms[i].fCurrentValue = m;