aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrPathProcessor.cpp
diff options
context:
space:
mode:
authorGravatar egdaniel <egdaniel@google.com>2016-05-09 10:22:19 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-09 10:22:19 -0700
commitfe8a8392217072fdd5505edc3876a9698608ada1 (patch)
tree1868b177decc13082ac5113ee6820df497451650 /src/gpu/GrPathProcessor.cpp
parent9daa4b92d73a1ae441c864a0ae73dda6c3397acb (diff)
Break apart shared use of varying and uniform transforms
Diffstat (limited to 'src/gpu/GrPathProcessor.cpp')
-rw-r--r--src/gpu/GrPathProcessor.cpp10
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;