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

Unified Diff: include/gpu/GrFragmentProcessor.h

Issue 654313002: Auto-compare GrProcessors' texture accesses in isEqual(). (Closed) Base URL: https://skia.googlesource.com/skia.git@xformcomp
Patch Set: update Created 6 years, 2 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 | « no previous file | include/gpu/GrGeometryProcessor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrFragmentProcessor.h
diff --git a/include/gpu/GrFragmentProcessor.h b/include/gpu/GrFragmentProcessor.h
index 464230717645c9415cde2a52ab6c0bc479eb8372..044e807aae985547481920ef76d2018fc406df1e 100644
--- a/include/gpu/GrFragmentProcessor.h
+++ b/include/gpu/GrFragmentProcessor.h
@@ -45,17 +45,13 @@ public:
A return value of true from isEqual() should not be used to test whether the prceossor would
generate the same shader code. To test for identical code generation use the prceossor' keys
computed by the GrBackendProcessorFactory. */
- bool isEqual(const GrFragmentProcessor& other) const {
- if (&this->getFactory() != &other.getFactory() || !this->hasSameTransforms(other)) {
+ bool isEqual(const GrFragmentProcessor& that) const {
+ if (&this->getFactory() != &that.getFactory() ||
+ !this->hasSameTransforms(that) ||
+ !this->hasSameTextureAccesses(that)) {
return false;
}
- bool result = this->onIsEqual(other);
-#ifdef SK_DEBUG
- if (result) {
- this->assertTexturesEqual(other);
- }
-#endif
- return result;
+ return this->onIsEqual(that);
}
protected:
« no previous file with comments | « no previous file | include/gpu/GrGeometryProcessor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698