Chromium Code Reviews| Index: include/gpu/GrFragmentProcessor.h |
| diff --git a/include/gpu/GrFragmentProcessor.h b/include/gpu/GrFragmentProcessor.h |
| index b0ef6b5845e1d82d89e343e79f3fe36da18c0949..df6860e981858a831e7681d24416877c9551bad1 100644 |
| --- a/include/gpu/GrFragmentProcessor.h |
| +++ b/include/gpu/GrFragmentProcessor.h |
| @@ -183,7 +183,7 @@ private: |
| bool hasSameTransforms(const GrFragmentProcessor&) const; |
| - bool fUsesLocalCoords; |
| + bool fUsesLocalCoords; |
| /** |
| * fCoordTransforms stores the transforms of this proc, followed by all the transforms of this |
| @@ -208,14 +208,10 @@ private: |
| * |
| * The same goes for fTextureAccesses with textures. |
| */ |
| - SkSTArray<4, const GrCoordTransform*, true> fCoordTransforms; |
| - |
| - int fNumTexturesExclChildren; |
| - int fNumTransformsExclChildren; |
| - |
| - // TODO: These must convert their processors to pending-execution refs when the parent is |
|
bsalomon
2015/11/19 15:39:13
This has basically been done.
|
| - // converted (do this automatically in GrProgramElement?). |
| - SkTArray<const GrFragmentProcessor*, true> fChildProcessors; |
| + SkSTArray<4, const GrCoordTransform*, true> fCoordTransforms; |
| + int fNumTexturesExclChildren; |
| + int fNumTransformsExclChildren; |
| + SkSTArray<2, const GrFragmentProcessor*, true> fChildProcessors; |
| typedef GrProcessor INHERITED; |
| }; |