| Index: include/gpu/GrGeometryProcessor.h
|
| diff --git a/include/gpu/GrGeometryProcessor.h b/include/gpu/GrGeometryProcessor.h
|
| index 5f32c5d0cc12c5a799df1b420a3fc15caf478cd8..60928f2f10be706fb1702dd179727a140187c925 100644
|
| --- a/include/gpu/GrGeometryProcessor.h
|
| +++ b/include/gpu/GrGeometryProcessor.h
|
| @@ -44,16 +44,10 @@ public:
|
| would generate the same shader code. To test for identical code generation use the
|
| processors' keys computed by the GrBackendEffectFactory. */
|
| bool isEqual(const GrGeometryProcessor& that) const {
|
| - if (&this->getFactory() != &that.getFactory()) {
|
| + if (&this->getFactory() != &that.getFactory() || !this->hasSameTextureAccesses(that)) {
|
| return false;
|
| }
|
| - bool result = this->onIsEqual(that);
|
| -#ifdef SK_DEBUG
|
| - if (result) {
|
| - this->assertTexturesEqual(that);
|
| - }
|
| -#endif
|
| - return result;
|
| + return this->onIsEqual(that);
|
| }
|
|
|
| protected:
|
|
|