From e578a95d3ab16544794b94da4e7ae13fc2ce6244 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Thu, 14 May 2015 10:09:13 -0700 Subject: Remove viewmatrix from GrGeometryProcessor base class BUG=skia: Review URL: https://codereview.chromium.org/1127953003 --- src/gpu/GrAAConvexPathRenderer.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/gpu/GrAAConvexPathRenderer.cpp') 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(); 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(); 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(); fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType)); -- cgit v1.2.3