aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrAAConvexPathRenderer.cpp
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-05-14 10:09:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-05-14 10:09:14 -0700
commite578a95d3ab16544794b94da4e7ae13fc2ce6244 (patch)
treeaaa10af66b9f6acee7444e827b91825ae2fa313d /src/gpu/GrAAConvexPathRenderer.cpp
parent5b9f352ff1e245dd48e200f8f8b683f4569547d3 (diff)
Remove viewmatrix from GrGeometryProcessor base class
Diffstat (limited to 'src/gpu/GrAAConvexPathRenderer.cpp')
-rw-r--r--src/gpu/GrAAConvexPathRenderer.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index e9a58ac385..b0e0cdaf7d 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -562,7 +562,7 @@ public:
&fColorUniform);
// Setup position
- this->setupPosition(pb, gpArgs, qe.inPosition()->fName, qe.viewMatrix());
+ this->setupPosition(pb, gpArgs, qe.inPosition()->fName);
// emit transforms
this->emitTransforms(args.fPB, gpArgs->fPositionVar, qe.inPosition()->fName,
@@ -600,15 +600,12 @@ public:
const BatchTracker& local = bt.cast<BatchTracker>();
uint32_t key = local.fInputColorType << 16;
key |= local.fUsesLocalCoords && gp.localMatrix().hasPerspective() ? 0x1 : 0x0;
- key |= ComputePosKey(gp.viewMatrix()) << 1;
b->add32(key);
}
virtual void setData(const GrGLProgramDataManager& pdman,
const GrPrimitiveProcessor& gp,
const GrBatchTracker& bt) override {
- this->setUniformViewMatrix(pdman, gp.viewMatrix());
-
const BatchTracker& local = bt.cast<BatchTracker>();
if (kUniform_GrGPInput == local.fInputColorType && local.fColor != fColor) {
GrGLfloat c[4];
@@ -644,7 +641,7 @@ public:
private:
QuadEdgeEffect(GrColor color, const SkMatrix& localMatrix)
- : INHERITED(SkMatrix::I(), localMatrix)
+ : INHERITED(localMatrix)
, fColor(color) {
this->initClassID<QuadEdgeEffect>();
fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));