diff options
author | egdaniel <egdaniel@google.com> | 2016-05-09 10:22:19 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-09 10:22:19 -0700 |
commit | fe8a8392217072fdd5505edc3876a9698608ada1 (patch) | |
tree | 1868b177decc13082ac5113ee6820df497451650 /src/gpu/GrPathProcessor.cpp | |
parent | 9daa4b92d73a1ae441c864a0ae73dda6c3397acb (diff) |
Break apart shared use of varying and uniform transforms
This is a pre-cl for: https://codereview.chromium.org/1955893002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1961093002
Review-Url: https://codereview.chromium.org/1961093002
Diffstat (limited to 'src/gpu/GrPathProcessor.cpp')
-rw-r--r-- | src/gpu/GrPathProcessor.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp index f01b240d8a..5237ba1cfd 100644 --- a/src/gpu/GrPathProcessor.cpp +++ b/src/gpu/GrPathProcessor.cpp @@ -97,7 +97,7 @@ public: int index, const SkTArray<const GrCoordTransform*, true>& coordTransforms) override { const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>(); - SkSTArray<2, Transform, true>& transforms = fInstalledTransforms[index]; + SkSTArray<2, VaryingTransform, true>& transforms = fInstalledTransforms[index]; int numTransforms = transforms.count(); for (int t = 0; t < numTransforms; ++t) { SkASSERT(transforms[t].fHandle.isValid()); @@ -116,6 +116,14 @@ public: } private: + typedef GrGLSLProgramDataManager::VaryingHandle VaryingHandle; + struct VaryingTransform : public Transform { + VaryingTransform() : Transform() {} + VaryingHandle fHandle; + }; + + SkSTArray<8, SkSTArray<2, VaryingTransform, true> > fInstalledTransforms; + UniformHandle fColorUniform; GrColor fColor; |