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

Unified Diff: src/gpu/GrDrawState.h

Issue 438053002: Don't compare coord change matrices to determine effect compatibility when using explicit local coo… (Closed) Base URL: https://skia.googlesource.com/skia.git@nomat
Patch Set: Add comment Created 6 years, 4 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 | « include/gpu/GrEffectStage.h ('k') | src/gpu/gl/GrGLProgramEffects.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDrawState.h
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index d1b7a66f5ca454c464d6252c3788bafa2a5630e3..b894cb5a2922a9c21e766efb019ccc41789ba6b8 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -893,13 +893,17 @@ public:
fDrawFace != that.fDrawFace) {
return false;
}
+
+ bool explicitLocalCoords = this->hasLocalCoordAttribute();
for (int i = 0; i < fColorStages.count(); i++) {
- if (fColorStages[i] != that.fColorStages[i]) {
+ if (!GrEffectStage::AreCompatible(fColorStages[i], that.fColorStages[i],
+ explicitLocalCoords)) {
return false;
}
}
for (int i = 0; i < fCoverageStages.count(); i++) {
- if (fCoverageStages[i] != that.fCoverageStages[i]) {
+ if (!GrEffectStage::AreCompatible(fCoverageStages[i], that.fCoverageStages[i],
+ explicitLocalCoords)) {
return false;
}
}
« no previous file with comments | « include/gpu/GrEffectStage.h ('k') | src/gpu/gl/GrGLProgramEffects.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698