Expose coord transforms from GrPipeline

src/gpu/GrPipeline.cpp

Index: src/gpu/GrPipeline.cpp
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index c3b8e77c1aa5317ca7337b0d047535ab5510044a..6bbf05e600d326539ff767aab4ec4647a5ff7a12 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -87,20 +87,24 @@ GrPipeline::GrPipeline(const GrPipelineBuilder& pipelineBuilder,
 
     // Copy Stages from PipelineBuilder to Pipeline
     for (int i = firstColorStageIdx; i < pipelineBuilder.numColorFragmentStages(); ++i) {
-        SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
-                               GrPendingFragmentStage,
-                               (pipelineBuilder.fColorStages[i]));
-        usesLocalCoords = usesLocalCoords ||
-                          pipelineBuilder.fColorStages[i].processor()->usesLocalCoords();
+        const GrFragmentStage& fps = pipelineBuilder.fColorStages[i];
+        const GrFragmentProcessor* fp = fps.processor();

[bsalomon, 2015/08/05 17:22:12]

does this all work for the nested case?

[joshualitt, 2015/08/05 17:46:21]

good catch

+        SkNEW_APPEND_TO_TARRAY(&fFragmentStages, GrPendingFragmentStage, (fps));
+        usesLocalCoords = usesLocalCoords || fp->usesLocalCoords();
+        for (int t = 0; t < fp->numTransforms(); t++) {
+            fCoordTransforms.push_back(&fp->coordTransform(t));
+        }
     }
 
     fNumColorStages = fFragmentStages.count();
     for (int i = firstCoverageStageIdx; i < pipelineBuilder.numCoverageFragmentStages(); ++i) {
-        SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
-                               GrPendingFragmentStage,
-                               (pipelineBuilder.fCoverageStages[i]));
-        usesLocalCoords = usesLocalCoords ||
-                          pipelineBuilder.fCoverageStages[i].processor()->usesLocalCoords();
+        const GrFragmentStage& fps = pipelineBuilder.fCoverageStages[i];
+        const GrFragmentProcessor* fp = fps.processor();
+        SkNEW_APPEND_TO_TARRAY(&fFragmentStages, GrPendingFragmentStage, (fps));
+        usesLocalCoords = usesLocalCoords || fp->usesLocalCoords();
+        for (int t = 0; t < fp->numTransforms(); t++) {
+            fCoordTransforms.push_back(&fp->coordTransform(t));
+        }
     }
 
     // Setup info we need to pass to GrPrimitiveProcessors that are used with this GrPipeline.
@@ -152,7 +156,7 @@ void GrPipeline::adjustProgramFromOptimizations(const GrPipelineBuilder& pipelin
 
 ////////////////////////////////////////////////////////////////////////////////
 
-bool GrPipeline::isEqual(const GrPipeline& that) const {
+bool GrPipeline::isEqual(const GrPipeline& that, bool ignoreCoordTransforms) const {
     // If we point to the same pipeline, then we are necessarily equal
     if (this == &that) {
         return true;
@@ -172,11 +176,9 @@ bool GrPipeline::isEqual(const GrPipeline& that) const {
         return false;
     }
 
-    // The program desc comparison should have already assured that the stage counts match.
-    SkASSERT(this->numFragmentStages() == that.numFragmentStages());
     for (int i = 0; i < this->numFragmentStages(); i++) {
-
-        if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
+        if (!this->getFragmentStage(i).processor()->isEqual(*that.getFragmentStage(i).processor(),
+                                                            ignoreCoordTransforms)) {
             return false;
         }
     }