Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1726)

Unified Diff: include/gpu/GrSamplerState.h

Issue 6199053: Ganesh custom shader: GrConvolutionEffect (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Respond to Brian's comments Created 12 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: include/gpu/GrSamplerState.h
===================================================================
--- include/gpu/GrSamplerState.h (revision 3867)
+++ include/gpu/GrSamplerState.h (working copy)
@@ -133,9 +133,9 @@
return !memcmp(this, &s, bitwiseRegion) &&
((fCustomStage == s.fCustomStage) ||
(fCustomStage && s.fCustomStage &&
- (fCustomStage->getGLFactory() ==
- s.fCustomStage->getGLFactory()) &&
- fCustomStage->isEquivalent(s.fCustomStage)));
+ (fCustomStage->getFactory() ==
+ s.fCustomStage->getFactory()) &&
+ fCustomStage->isEqual(s.fCustomStage)));
}
bool operator !=(const GrSamplerState& s) const { return !(*this == s); }
« no previous file with comments | « include/gpu/GrCustomStage.h ('k') | src/gpu/GrContext.cpp » ('j') | src/gpu/GrContext.cpp » ('J')

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b