Index: src/gpu/GrOvalRenderer.cpp |
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp |
index 0a18b49b0ccad9836971d09610b4dcb70d4a8fef..481501f1299df97eb301cb9056d26c807396f769 100644 |
--- a/src/gpu/GrOvalRenderer.cpp |
+++ b/src/gpu/GrOvalRenderer.cpp |
@@ -105,12 +105,8 @@ public: |
this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, NULL, |
&fColorUniform); |
- // setup uniform viewMatrix |
- this->addUniformViewMatrix(pb); |
- |
// Setup position |
- SetupPosition(vsBuilder, gpArgs, ce.inPosition()->fName, |
- ce.viewMatrix(), this->uViewM()); |
+ this->setupPosition(pb, gpArgs, ce.inPosition()->fName, ce.viewMatrix()); |
// emit transforms |
this->emitTransforms(args.fPB, gpArgs->fPositionVar, ce.inPosition()->fName, |
@@ -288,12 +284,8 @@ public: |
this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, NULL, |
&fColorUniform); |
- // setup uniform viewMatrix |
- this->addUniformViewMatrix(pb); |
- |
// Setup position |
- SetupPosition(vsBuilder, gpArgs, ee.inPosition()->fName, |
- ee.viewMatrix(), this->uViewM()); |
+ this->setupPosition(pb, gpArgs, ee.inPosition()->fName, ee.viewMatrix()); |
// emit transforms |
this->emitTransforms(args.fPB, gpArgs->fPositionVar, ee.inPosition()->fName, |
@@ -493,12 +485,8 @@ public: |
this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, NULL, |
&fColorUniform); |
- // setup uniform viewMatrix |
- this->addUniformViewMatrix(pb); |
- |
// Setup position |
- SetupPosition(vsBuilder, gpArgs, ee.inPosition()->fName, |
- ee.viewMatrix(), this->uViewM()); |
+ this->setupPosition(pb, gpArgs, ee.inPosition()->fName, ee.viewMatrix()); |
// emit transforms |
this->emitTransforms(args.fPB, gpArgs->fPositionVar, ee.inPosition()->fName, |