Index: src/gpu/gl/builders/GrGLProgramBuilder.cpp |
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp |
index 9c0e7ab526f5f940e56257a9e8c15c6d542959bd..daa24800d2e9664f63b3c287c5223007aead50ce 100644 |
--- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp |
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp |
@@ -179,6 +179,18 @@ const GrGLContextInfo& GrGLProgramBuilder::ctxInfo() const { |
return fGpu->ctxInfo(); |
} |
+static void append_gr_fp_coord_transforms(const GrFragmentProcessor* processor, |
+ SkTArray<const GrCoordTransform*, true>* procCoords) { |
+ // add the coord transforms of this processor |
+ for (int i = 0; i < processor->numTransforms(); ++i) { |
+ procCoords->push_back(&processor->coordTransform(i)); |
+ } |
+ // recursively add the coord transforms of this processor's child processors |
+ for (int i = 0; i < processor->numChildProcessors(); ++i) { |
+ append_gr_fp_coord_transforms(processor->childProcessor(i), procCoords); |
+ } |
+} |
+ |
bool GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr4* inputCoverage) { |
// First we loop over all of the installed processors and collect coord transforms. These will |
// be sent to the GrGLPrimitiveProcessor in its emitCode function |
@@ -189,11 +201,10 @@ bool GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr |
for (int i = 0; i < this->pipeline().numFragmentStages(); i++) { |
const GrFragmentProcessor* processor = this->pipeline().getFragmentStage(i).processor(); |
SkSTArray<2, const GrCoordTransform*, true>& procCoords = fCoordTransforms.push_back(); |
- for (int t = 0; t < processor->numTransforms(); t++) { |
- procCoords.push_back(&processor->coordTransform(t)); |
- } |
- totalTextures += processor->numTextures(); |
+ append_gr_fp_coord_transforms(processor, &procCoords); |
+ |
+ totalTextures += processor->numTexturesIncludeChildProcs(); |
if (totalTextures >= maxTextureUnits) { |
GrCapsDebugf(fGpu->caps(), "Program would use too many texture units\n"); |
return false; |
@@ -284,7 +295,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrPendingFragmentStage& fs, |
const GrFragmentProcessor& fp = *fs.processor(); |
ifp->fGLProc.reset(fp.createGLInstance()); |
- SkSTArray<4, GrGLProcessor::TextureSampler> samplers(fp.numTextures()); |
+ SkSTArray<4, GrGLProcessor::TextureSampler> samplers(fp.numTexturesIncludeChildProcs()); |
this->emitSamplers(fp, &samplers, ifp); |
GrGLFragmentProcessor::EmitArgs args(this, fp, outColor, inColor, fOutCoords[index], samplers); |