Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: src/gpu/GrOvalRenderer.cpp

Issue 920933002: fix for uniform view matrix being uploaded but not used (Closed) Base URL: https://skia.googlesource.com/skia.git@gp_cleanup_1
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrGeometryProcessor.cpp ('k') | src/gpu/effects/GrBezierEffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « src/gpu/GrGeometryProcessor.cpp ('k') | src/gpu/effects/GrBezierEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698